diff --git a/TODO.markdown b/TODO.markdown
index c290fb3a..da442a19 100644
--- a/TODO.markdown
+++ b/TODO.markdown
@@ -1,13 +1,10 @@
 # TODO
 
 * outgoing [AI]xfr
-* zonereader that extracts glue (or at least signals it) and other usefull stuff?
-* a complete dnssec resolver
 * test multiple edns0 options
 * fix 'q' standardize ipv6 input with [::1]#53 ?
 * use function callback with {}interface...  for async querying...?
-  Maybe in version v2 of this lib
-  Us
+* merge send/receive in Exchange*()
 
 ## Nice to have
 
diff --git a/client.go b/client.go
index fcd2c5dc..5fe76487 100644
--- a/client.go
+++ b/client.go
@@ -29,7 +29,7 @@ type Client struct {
 	ReadTimeout  time.Duration     // the net.Conn.SetReadTimeout value for new connections (ns), defauls to 2 * 1e9
 	WriteTimeout time.Duration     // the net.Conn.SetWriteTimeout value for new connections (ns), defauls to 2 * 1e9
 	TsigSecret   map[string]string // secret(s) for Tsig map[<zonename>]<base64 secret>
-	//	Hijacked     net.Conn          // if set the calling code takes care of the connection
+	// Hijacked     net.Conn       // if set the calling code takes care of the connection
 	// LocalAddr string            // Local address to use
 }