diff --git a/todo/shinnok.txt b/todo/shinnok.txt
index 32a77b0c1..310c6ff33 100644
--- a/todo/shinnok.txt
+++ b/todo/shinnok.txt
@@ -1,12 +1,33 @@
 In progress:
 ============
 
-o Nmap *poor's man* test suite by expanding on what I already have in
-  /nmap-exp/shinnok/nmap-test-script.
+o We should offer partial results when a host
+  timeouts. I (Fyodor) have been against this in the past, but maybe
+  the value is sufficient to be worth the maintenance headaches.  Many
+  users have asked for this.  If we do implement this, we may want to
+  only print results for the COMPLETED phases (e.g. host discovery,
+  port scanning, version detection, traceroute, NSE, etc.)  Trying to
+  print partial results of a port scan or NSE or the like might be a
+  pain.  And if we print some results for a host which timeouts, we
+  should give a very clear warning that the results for that host are
+  incomplete. As an example, here is someone who hacked Nmap source
+  code to achieve this: http://seclists.org/pen-test/2010/Mar/108.
+  o Another benefit would be that it would allow us to clean
+    up/regularize the host output code. Right now there are I think
+    three places where a host's final output can be printed. If,
+    instead, that code just looked at what information was available and
+    printed that out only, we could potentially isolate it in just one
+    place.
+  o This also might let us provide a feature for skipping the rest of
+    an Nmap phase which is going too slowly (I think that has its own
+    Nmap TODO item).
 
 Hanging(waiting for further input, etc..):
 ==========================================
 
+o Nmap *poor's man* test suite by expanding on what I already have in
+  /nmap-exp/shinnok/nmap-test-script.
+
 o NMAP reports different service results every so often with the same port.
   http://seclists.org/nmap-dev/2011/q2/815
 
@@ -20,10 +41,6 @@ Pending:
 Pending (low priority):
 =======================
 
-o libpcre/pcre.h - is cleared upon make distclean thus leaving the SVN
-  working directory dirty
-  http://seclists.org/nmap-dev/2011/q2/708
-
 o E-mail nmap-dev with GProfiles /ncrack
   o Create new default username list:
   http://seclists.org/nmap-dev/2010/q1/798
@@ -47,30 +64,15 @@ o Consider offering a way to link Winpcap DLLs so that they start the
   build our Winpcap binaries ourselves (including 64-bit).  We might
   even have to sign our drivers for 64-bit Windows.
 
-o We should offer partial results when a host
-  timeouts. I (Fyodor) have been against this in the past, but maybe
-  the value is sufficient to be worth the maintenance headaches.  Many
-  users have asked for this.  If we do implement this, we may want to
-  only print results for the COMPLETED phases (e.g. host discovery,
-  port scanning, version detection, traceroute, NSE, etc.)  Trying to
-  print partial results of a port scan or NSE or the like might be a
-  pain.  And if we print some results for a host which timeouts, we
-  should give a very clear warning that the results for that host are
-  incomplete. As an example, here is someone who hacked Nmap source
-  code to achieve this: http://seclists.org/pen-test/2010/Mar/108.
-  o Another benefit would be that it would allow us to clean
-    up/regularize the host output code. Right now there are I think
-    three places where a host's final output can be printed. If,
-    instead, that code just looked at what information was available and
-    printed that out only, we could potentially isolate it in just one
-    place.
-  o This also might let us provide a feature for skipping the rest of
-    an Nmap phase which is going too slowly (I think that has its own
-    Nmap TODO item).
-
 COMPLETED:
 ==========
 
+o Add a --append-output option to ncat. [DONE - r25737]
+
+o libpcre/pcre.h - is cleared upon make distclean thus leaving the SVN
+  working directory dirty
+  http://seclists.org/nmap-dev/2011/q2/708
+
 o De-duplicate code by unifying ncat_broker.c and ncat_listen.c code paths,
   either as a single file in ncat_listen.c or merge duplicate code in
   ncat_listen.c and keep only broker specific code in ncat_broker.c(it it's a