diff --git a/bin/cdist b/bin/cdist
index 0f37db2e..466604fa 100755
--- a/bin/cdist
+++ b/bin/cdist
@@ -195,13 +195,15 @@ if __name__ == "__main__":
         import re
         import sys
 
+        # Ensure our /lib/ is included into PYTHON_PATH
+        sys.path.insert(0, os.path.abspath(
+                os.path.join(os.path.dirname(os.path.realpath(__file__)), '../lib')))
+
+        # And now import our stuff
         import cdist
 
         log = logging.getLogger("cdist")
 
-        # Ensure our /lib/ is included into PYTHON_PATH
-        sys.path.insert(0, os.path.abspath(
-                os.path.join(os.path.dirname(os.path.realpath(__file__)), '../lib')))
 
         logging.basicConfig(format='%(levelname)s: %(message)s')
 
diff --git a/doc/dev/todo/niconext b/doc/dev/todo/niconext
index cb5b9158..2f9bb844 100644
--- a/doc/dev/todo/niconext
+++ b/doc/dev/todo/niconext
@@ -1,12 +1,3 @@
-2.0.3:
-
-- sanity checks: implement tests
-
---------------------------------------------------------------------------------
-
-- insert prefix into logger to distinguish between modules
-   - in debug/info only?
-
 - Fix / rewrite cdist-quickstart
 
 - write tutorial!!!!!!!!!