diff --git a/doc/dev/todo/niconext b/doc/dev/todo/niconext
index 66e1baee..47e12bf6 100644
--- a/doc/dev/todo/niconext
+++ b/doc/dev/todo/niconext
@@ -1,8 +1,22 @@
+- write tutorial
+    - remove cdist(7) reference everywhere
+    - check cross links
+
+- check other docs:
+    - cdist-best-practice.text
+    - cdist-explorer.text
+    - cdist-hacker.text
+    - cdist-manifest.text
+    - cdist-reference.text
+    - cdist-stages.text
+    - cdist-type.text
+
+--------------------------------------------------------------------------------
+
+
 - check speech publishing
     - and speeches, which may be outdated as well
 
-- write tutorial
-
 - Fix / rewrite cdist-quickstart
 
    - like ccollect!
diff --git a/doc/man/man7/cdist-best-practice.text b/doc/man/man7/cdist-best-practice.text
index 5ec01d5f..7d947fce 100644
--- a/doc/man/man7/cdist-best-practice.text
+++ b/doc/man/man7/cdist-best-practice.text
@@ -141,7 +141,7 @@ you to push certain branches to certain remotes.
 
 SEE ALSO
 --------
-- cdist(7)
+- cdist(1)
 
 
 COPYING
diff --git a/doc/man/man7/cdist-explorer.text b/doc/man/man7/cdist-explorer.text
index e1909ab5..b9c342a9 100644
--- a/doc/man/man7/cdist-explorer.text
+++ b/doc/man/man7/cdist-explorer.text
@@ -57,7 +57,7 @@ dpkg -s "$name" 2>/dev/null || exit 0
 
 SEE ALSO
 --------
-- cdist(7)
+- cdist(1)
 - cdist-reference(7)
 - cdist-stages(7)
 
diff --git a/doc/man/man7/cdist-tutorial.text b/doc/man/man7/cdist-tutorial.text
index 883fcd73..9d068030 100644
--- a/doc/man/man7/cdist-tutorial.text
+++ b/doc/man/man7/cdist-tutorial.text
@@ -133,6 +133,8 @@ the reference with pointers to the manpages.
 
 PARTS BELOW HERE ARE TO-BE-DONE
 
+-> ssh stuff double: cdist-best-practice and here
+
 
 MANAGING YOUR OWN CONFIGURATION
 -------------------------------
@@ -140,6 +142,9 @@ MANAGING YOUR OWN CONFIGURATION
 CREATING YOUR FIRST OWN TYPE
 ----------------------------
 => short example, reference to cdist-type(7)!
+=> motivation
+
+Use a type to bundle functionalitY
 
 <with object id? or signleton here already>
 
@@ -152,25 +157,9 @@ __debug::
 
 
 
-MORE ABOUT TYPES AND OBJECTS
-----------------------------
-All available types in cdist can be called like normal executables. 
-
-
-USING SOME BASIC TYPES
-----------------------
-what is a type, how to use it,
-
-
-
-
-USE A TYPE TO BUNDLE FUNCTIONALITY
-----------------------------------
-
-
 USING EXPLORERS
 ---------------
-global, type explorer
+cdist-explorer.text
 
 
 DEBUGGING YOUR TYPES
@@ -183,8 +172,12 @@ TUNING CDIST
 
 - speedup processing with ControlMaster option of
 ssh
+=> different document
 
 
 SEE ALSO
 --------
-cdist(1), cdist-type(7), cdist-stages(7)
+- cdist(1)
+- cdist-type(7)
+- cdist-best-practice(7)
+- cdist-stages(7)?