diff --git a/dastworx/src/main.d b/dastworx/src/main.d
index e36476c3..643d8ee9 100644
--- a/dastworx/src/main.d
+++ b/dastworx/src/main.d
@@ -138,7 +138,8 @@ version(devel)
     version(none) import std.compiler;
     version(all) import std.uri;
     mixin(q{import std.c.time;});
-
-    // TODO:something
+    // TODO: something
+    // NOTE: there was a bug here...
+    // FIXME-cmain-aMrFreeze-p8: there's an infinite recursion whith the option -x
 }
 
diff --git a/dastworx/src/runnableflags.d b/dastworx/src/runnableflags.d
index b1fb08ad..bf0750b1 100644
--- a/dastworx/src/runnableflags.d
+++ b/dastworx/src/runnableflags.d
@@ -12,7 +12,7 @@ import
  * ModuleDeclaration and that are passed to the compiler when a runnable is
  * launched.
  *
- * each line of the soutput contains an option.
+ * each line of the output contains an option.
  */
 void getRunnableFlags(const(Token)[] tokens)
 {
diff --git a/dastworx/src/todos.d b/dastworx/src/todos.d
index 1eb0764d..fddf6c95 100644
--- a/dastworx/src/todos.d
+++ b/dastworx/src/todos.d
@@ -66,7 +66,7 @@ private void analyze(const(Token) token, string fname)
     {
         identifier ~= std.ascii.toUpper(text.front);
         text.popFront;
-        if (identifier.among("TODO","FIXME, NOTE"))
+        if (identifier.among("TODO", "FIXME", "NOTE"))
         {
             isTodoComment = true;
             break;