diff --git a/README.markdown b/README.markdown
index 64556e8e..7601308a 100644
--- a/README.markdown
+++ b/README.markdown
@@ -9,14 +9,17 @@ implemented in the library.
 Features:
 
 * UDP/TCP queries, IPv4 and IPv6;
+* Fast, query speed should be around 30K qps. Parsing RR (from zonefiles)
+    does about 25K RR/s.
+    This is expected to be optimized in the near future;
 * Client and server side programming (mimicking the http package);
 * Asynchronous queries for client and server;
+* RFC 1035 zone file parsing.
 * DNSSEC;
 * EDNS0;
 * AXFR/IXFR;
 * TSIG;
 * DNS name compression;
-* RFC 1035 zone file parsing.
 
 Sample programs can be found in the `_examples` directory. They can 
 be build with: `make examples` (after the dns package has been installed)
@@ -25,7 +28,7 @@ Have fun!
 
 Miek Gieben  -  2010-2012 - miek@miek.nl
 
-## Supported RFCs and features include:
+## Supported RFCs
 
 * 103{4,5}  - DNS standard
 * 1982 - Serial Arithmetic
diff --git a/TODO.markdown b/TODO.markdown
index aadc884d..4477e4ac 100644
--- a/TODO.markdown
+++ b/TODO.markdown
@@ -5,10 +5,10 @@ things that need to be fixed.
 
 * Parsing
     * $INCLUDE 
+* Speed, we can always go faster. A simple reflect server now hits 30K qps
 * Add handy zone data structure (r/b tree)?
 * Use the Exchange structure to deal with errors when resolving, esp. Timeout
 * IsSubdomain, IsGlue helper functions;
-* Speed
 * SaltLength in NSEC3 is ugly to set, should be automatically done. There are prolly a few more
     settings just like that -- need to look at them.
     -edns NSID is another