diff --git a/TODO b/TODO
index 8b2c7bfa..eeb9c496 100644
--- a/TODO
+++ b/TODO
@@ -4,27 +4,25 @@ o symmetrical, client side stuff should be mirrored in the server stuff
 o clean, small API
 o fast data structures (rb-tree, when they come available)
 o api-use should lead to self documenting code
+
 o compression (only ownernames?)
+
+
+o Closing of tcp connections?
 o Tsig will probably become an interface which has all configuration
   stuff, but this will come later
 
-
 Todo:
 * Parsing from strings, going with goyacc and .cz lexer?
 * encoding NSEC3/NSEC bitmaps, DEcoding works
 * HIP RR (needs list of domain names, need slice stuff for that)
-* Resolver can see if you want ixfr or axfr from the msg no
-  need for seperate functions
-* Is subdomain, is glue helper functions
+* Is subdomain, is glue helper functions for this kind of stuff
 
 Issues:
 * Check the network order, it works now, but this is on Intel??
 * Make the testsuite work with public DNS servers
 * pack/Unpack smaller. EDNS 'n stuff can be folded in
 * SetDefaults() for *all* types?
-* Closing of tcp connections?
-
-* Refacter the IXFR/AXFR/TSIG code
 
 Examples:
 * Test impl of nameserver, with a small zone, 1 KSK and online  signing