diff --git a/src/core/sal/Listener.hpp b/src/core/sal/Listener.hpp
index ed422213..f538d077 100644
--- a/src/core/sal/Listener.hpp
+++ b/src/core/sal/Listener.hpp
@@ -31,7 +31,7 @@ protected:
 public:
 	BaseListener() : m_OccCounter(1), m_OccCounterInit(1), m_Parent(NULL)
 	{ }
-	virtual ~BaseListener() { }
+	virtual ~BaseListener() { } // FIXME remove from queues
 	/**
 	 * This method is called when an experiment flow adds a new listener by
 	 * calling \c simulator.addListener() or \c simulator.addListenerAndResume().
@@ -559,7 +559,7 @@ public:
 	 * Creates a new timer listener. This can be used to implement a timeout-
 	 * mechanism in the experiment-flow. The timer starts automatically when
 	 * added to the simulator backend.
-	 * @param timeout the time intervall in milliseconds (ms)
+	 * @param timeout the time interval in milliseconds (ms)
 	 * @see SimulatorController::addListener
 	 */
 	GenericTimerListener(unsigned timeout) : m_Timeout(timeout) { }
diff --git a/src/core/sal/bochs/BochsListener.hpp b/src/core/sal/bochs/BochsListener.hpp
index 10b280f3..db446d84 100644
--- a/src/core/sal/bochs/BochsListener.hpp
+++ b/src/core/sal/bochs/BochsListener.hpp
@@ -45,7 +45,7 @@ public:
 	 */
 	TimerListener(unsigned timeout)
 		: GenericTimerListener(timeout) { }
-	~TimerListener() { onDeletion(); }
+	~TimerListener() { onDeletion(); } // FIXME ~BaseListener should automatically dequeue a Listener, and then indirectly calls onDeletion.  In the current implementation, no dequeueing happens at all.
 	
 	/**
 	 * This method is called when an experiment flow adds a new event by
@@ -70,7 +70,7 @@ public:
 	 * will be called *before* the event is actually triggered, i.e. before the
 	 * corresponding coroutine is toggled.
 	 */
-	void onTrigger() { onDeletion(); }
+	void onTrigger() { onDeletion(); } // FIXME It should NOT be a Listener's job to call its own onDeletion.  ListenerManager should call onDeletion when it deletes a Listener from a queue.
 	// TODO/FIXME: bei neuer impl. anpassen
 };