diff --git a/src/core/sal/SimulatorController.hpp b/src/core/sal/SimulatorController.hpp
index b2b42d1e..b3ba4a3b 100644
--- a/src/core/sal/SimulatorController.hpp
+++ b/src/core/sal/SimulatorController.hpp
@@ -206,18 +206,20 @@ public:
 	 */
 	BaseListener* addListenerAndResume(BaseListener* li);
 	/**
-	 * Checks whether any experiment flow has listeners in the listener (buffer-)list.
+	 * Checks whether any experiment flow has listeners in the listener
+	 * (buffer-)list.  For internal use.
 	 * @return \c true if there are still listeners, or \c false otherwise
 	 */
 	bool hasListeners() const { return getListenerCount() > 0; }
 	/**
 	 * Determines the number of (stored) listeners in the listener-list which have
-	 * not been triggered so far.
+	 * not been triggered so far.  For internal use.
 	 * @return the actual number of listeners
 	 */
 	unsigned getListenerCount() const { return m_LstList.getListenerCount(); }
 	/**
-	 * Determines the pointer to the listener base type, stored at index \c idx.
+	 * Determines the pointer to the listener base type, stored at index \c
+	 * idx.  For internal use.
 	 * @param idx the index within the buffer-list of the listener to retrieve
 	 * @return the pointer to the (up-casted) base type (if \c idx is invalid and debug
 	 *         mode is enabled, an assertion is thrown)
@@ -226,7 +228,8 @@ public:
 	 */
 	inline BaseListener* dereference(index_t idx) { return m_LstList.dereference(idx); }
 	/**
-	 * Toggles the provided experiment flow by activating its coroutine.
+	 * Toggles the provided experiment flow by activating its coroutine.  For
+	 * internal use.
 	 * @param pfl the experiment flow to be activated
 	 */
 	void toggle(ExperimentFlow* pfl) { m_Flows.toggle(pfl); }
diff --git a/src/core/util/CommandLine.hpp b/src/core/util/CommandLine.hpp
index 507fe0b6..fa1f8c7f 100644
--- a/src/core/util/CommandLine.hpp
+++ b/src/core/util/CommandLine.hpp
@@ -64,9 +64,9 @@ namespace fail {
 
         /**
          *
-         * do the acutal parsing, called by the experiment
+         * do the actual parsing, called by the experiment
          *
-         * @return was the parsing a sucess
+         * @return true on success
          */
         bool parse();
 
diff --git a/src/plugins/tracing/trace.proto b/src/plugins/tracing/trace.proto
index a5032f24..8246295c 100644
--- a/src/plugins/tracing/trace.proto
+++ b/src/plugins/tracing/trace.proto
@@ -26,6 +26,5 @@ message Trace_Event {
 	}
 	optional AccessType accesstype = 4;
 
-    optional Trace_Event_Extended trace_ext = 5;
+	optional Trace_Event_Extended trace_ext = 5;
 }
-
diff --git a/tools/dump-trace/.gitignore b/tools/dump-trace/.gitignore
new file mode 100644
index 00000000..b94d6830
--- /dev/null
+++ b/tools/dump-trace/.gitignore
@@ -0,0 +1 @@
+trace_pb2.py