diff --git a/bin/cdist b/bin/cdist
index fda94888..873fbb1a 100755
--- a/bin/cdist
+++ b/bin/cdist
@@ -451,7 +451,6 @@ class Cdist:
       manifest = self.type_manifest_path(type)
       
       log.debug("%s: Running %s", cdist_object, manifest)
-      # FIXME: add more sensible checks for manifest
       if os.path.exists(manifest):
          env = {  "__object" :   self.object_dir(cdist_object), 
                   "__object_id": self.get_object_id_from_object(cdist_object),
diff --git a/doc/dev/todo/niconext b/doc/dev/todo/niconext
index 22f9f7b7..738cd692 100644
--- a/doc/dev/todo/niconext
+++ b/doc/dev/todo/niconext
@@ -2,6 +2,8 @@ For 2.0.0:
 
    - Remove all FIXME entries
    - Remove obsolete manpages
+   - support subcommands!
+      deploy? config?
 
 --------------------------------------------------------------------------------
 
@@ -15,3 +17,4 @@ For 2.0.0:
 - Rewrite cdist-type-emulator
    - Remove legacy code in cdist
    - Remove cdist-config
+