diff --git a/TODO b/TODO
index d3049af8..e156fe77 100644
--- a/TODO
+++ b/TODO
@@ -16,6 +16,8 @@
          - SHELL SCRIPTS! (executables? do not support?)
             - stdout
    - cleanup / integrate doc/man/cdist.text
+   - define how to write / provide functions
+      - keep generic / easy extension
 - cdist-deply-to
    - sync conf/{lib/,modules,host/$name}
 - cdist-explore
@@ -38,6 +40,7 @@
 - to implement (from cfengine):
    - file editing (sed, awk)
    - huge library of functions shipped by default
+   - disconnected clients with "cache"
 - release first public version, which includes at least:
    - manpages
 
@@ -45,3 +48,4 @@
 Later:
 
    - multi master setups
+   - pull strategy
diff --git a/doc/man/cdist.text b/doc/man/cdist.text
index c1b6667b..b1b5fc2f 100644
--- a/doc/man/cdist.text
+++ b/doc/man/cdist.text
@@ -16,8 +16,8 @@ approach (a server pushes out the configuration to the clients),
 but can also be used the pull way (see cdist-push-pull(7)).
 
 Cdist is configured in shell syntax, which is "compiled" to an
-internal configuration representation, which again is used to
-generate an executable, which is run on the client
+internal configuration representation (cconfig), which again
+is used to generate an executable, which is run on the client
 (see cdist-language(7), cdist-design(7)).