diff --git a/TODO.markdown b/TODO.markdown
index 6198381a..1d7006f4 100644
--- a/TODO.markdown
+++ b/TODO.markdown
@@ -8,6 +8,8 @@
     * verify
 * Use BIND10 memory efficient zone structure?
 * copy srv/mx sorting from base library
+* allow multiple edns0 options to exist in the record when converting
+  from/to wireformat
 
 ## Nice to have
 
diff --git a/defaults.go b/defaults.go
index 93aca90b..01ae7321 100644
--- a/defaults.go
+++ b/defaults.go
@@ -80,7 +80,7 @@ func (dns *Msg) SetUpdate(z string) *Msg {
 	return dns
 }
 
-// SetIxfr creates dns msg suitable for requesting an ixfr.
+// SetIxfr creates dns.Msg for requesting an IXFR.
 func (dns *Msg) SetIxfr(z string, serial uint32) *Msg {
 	dns.Id = Id()
 	dns.Question = make([]Question, 1)
@@ -93,7 +93,7 @@ func (dns *Msg) SetIxfr(z string, serial uint32) *Msg {
 	return dns
 }
 
-// SetAxfr creates dns msg suitable for requesting an axfr.
+// SetAxfr creates dns.Msg for requesting an AXFR.
 func (dns *Msg) SetAxfr(z string) *Msg {
 	dns.Id = Id()
 	dns.Question = make([]Question, 1)
diff --git a/tsig.go b/tsig.go
index d6400396..f05bc88e 100644
--- a/tsig.go
+++ b/tsig.go
@@ -25,7 +25,7 @@
 //	m := new(dns.Msg)
 //	m.SetAxfr("miek.nl.") 
 //	m.SetTsig("axfr.", dns.HmacMD5, 300, time.Now().Unix())
-//	t, err := c.XfrReceive(m, "85.223.71.124:53")
+//	t, err := c.TransferIn(m, "85.223.71.124:53")
 //	for r := range t { /* ... */ }
 //
 // You can now read the records from the AXFR as they come in. Each envelope is checked with TSIG.