diff --git a/TODO b/TODO
index e7841d03..56abaed6 100644
--- a/TODO
+++ b/TODO
@@ -1,8 +1,10 @@
 - doc:
    - cdist manpage (main manpage)
       - cleanup following man + their tree:
-         - cdist.text
-         - cdist-design.text
+         - cdist-language        [IMPORTANT]
+         - cdist-design.text     [IMPORTANT]
+         - cdist-push-pull
+         - cdist-quickstart
       - add terminology
       - define entry point
       - define modules / mix with library?
diff --git a/doc/man/cdist-design.text b/doc/man/cdist-design.text
index cdb0dcbd..6639e9fc 100644
--- a/doc/man/cdist-design.text
+++ b/doc/man/cdist-design.text
@@ -14,13 +14,16 @@ When using cdist with the push principle, the execution tree looks likes this:
 
 --------------------------------------------------------------------------------
 % server
-   cdist-deploy-to(1)
-      cdist-build(1)
+   cdist-deploy-to(1)         # main tool for deployment
+      cdist-config(1)         # setup environment
+      cdist-build(1)          # coordinates build process / dummy otherwise
          cdist-preprocess(1)  # fills up variables with content
             cdist-explore(1)  % client # explores client configuration
-         cdist-compile(1)     # parses configuration, creates internal state in cconfig format, verifies
+         cdist-compile(1)     # parses configuration,
+                              # creates internal state in cconfig format,
+                              # verifies configuration
          cdist-link(1)        # uses cconfig output, creates executable
-      cdist-remote-exec(1) # 
+      cdist-remote-exec(1)    # coordinates remote execution, dummy otherwise
          cdist-transfer(1)    # transfer executable to client
          cdist-execute(1)     % client # execute resulting executable
 --------------------------------------------------------------------------------
diff --git a/doc/man/cdist-language.text b/doc/man/cdist-language.text
index d03afd20..6ada06b4 100644
--- a/doc/man/cdist-language.text
+++ b/doc/man/cdist-language.text
@@ -55,6 +55,17 @@ Requirements:
    It MUST be incredible easy/dumb to add new types.
       => growable default types
 
+   - how to write a module
+      - module function autoloading via *.sh
+      - module "manifest"?
+         - create functions in *.sh 
+         - name functions "modulename_function"
+            module hellow
+            function kitty
+            => hellow_kitty
+
+      - you are advised (not forced) to put files
+         to a subdirectory named "files"
 
 SEE ALSO
 --------