diff --git a/tutorial/extending.wmml b/tutorial/extending.wmml
index 50e1fcaba376c38eddaf84c3699ed01dca0d2611..42dc49b1515f7a011c1e1af938b0c31a2bc61ef9 100644
--- a/tutorial/extending.wmml
+++ b/tutorial/extending.wmml
@@ -1,3 +1,10 @@
+<!--
+TODO:
+A chapter about wmml, Mdoc (The autodoc from the Image-module) and how
+to write moduledocementation.
+
+-->
+
 <chapter title="Pike internals - how to extend Pike">
 The rest of this book describes how Pike works and how to extend it with
 your own functions written in C or C++. Even if you are not interested in
diff --git a/tutorial/tutorial.wmml b/tutorial/tutorial.wmml
index 8bab16ef8ba86e1c88fc02eee1d6a311d3d28030..87dc535adef76a3e5463d8454ba2e8d355dbed72 100644
--- a/tutorial/tutorial.wmml
+++ b/tutorial/tutorial.wmml
@@ -6,6 +6,136 @@
 
 <!--
 TODO: Add a section about casts
+
+An Appendix about kompiling
+Running Pike on NT
+
+Hedda-notes: 
+
+Fix chapter 3 to be one reference-part and one tutorial-part.
+Make sure that all global functions and modules are described.
+Write an appendix about old functions, behaviors and keywords.
+  ("How to convert from old versions of Pike")
+
+
+Missing funktions in the manual:
+UNDEFINED
+_debug
+_describe
+_static_modules
+_typeof
+    "`!",
+    "`!=",
+    "`%",
+    "`&",
+    "`()",
+    "`*",
+    "`+",
+    "`-",
+    "`->",
+    "`/",
+    "`<",
+    "`<<",
+    "`<=",
+    "`==",
+    "`>",
+    "`>=",
+    "`>>",
+    "`[]",
+    "`^",
+    "`|",
+    "`~",   (All these should be checked for updates in 5)
+abs
+all_threads (link to threads)
+atan2
+atexit
+chmod
+chroot
+cleargroups
+closelog
+endpwent
+endgrent
+filesystem_stat
+get_all_groups
+get_all_users
+get_groups_for_user
+getgrent
+getgroups
+getegid
+geteuid
+getgid
+getgrgid
+getgrnam
+gethostbyaddr
+gethostbyname
+gethostname
+gethrtime
+gethrvtime
+getpgrp
+getppid
+getpwent
+getpwnam
+getpwuid
+getuid
+gmtime
+hardlink
+initgroups
+innetgr
+max
+min
+object_variablep
+openlog
+readlink
+resolvepath
+set_priority
+set_weak_flag
+setegid
+seteuid
+setgid
+setgrent
+setgroups
+setpwent
+setuid
+sgn
+symlink
+syslog
+this_thread
+thread_create
+thread_local
+thread_set_concurrency
+umask
+uname
+werror
+
+
+
+These functions shall be removed from chapter 16:
+catch      (Should be a link to misc)
+query_host_name  (Simulate-function! Move!)
+typeof         (Not a function and is documented in one way in misc
+                and another way in 16 (with a typo `?))
+
+
+
+
+Wrongly placed functions:
+_do_call_outs
+new
+basename  
+cpp 
+
+
+Errors:
+explode_path (error in "explode_path - exit Pike interpreter")
+
+Chapter 16 should be named "builtin functions"
+
+"This chapter is a reference for all the builtin functions in
+ Pike. They are listed in alphabetical order." is not correct if not
+all global functions are included (like threads and Stdio-stuff).
+If the Threads och Stdio-functions begin to work in the modules,
+this comment can be erased.
+
 --> 
 
 <firstpage>