--- a/stream.go	Sat Dec 31 11:45:44 2011 -0700
+++ b/stream.go	Sat Dec 31 12:11:02 2011 -0700
@@ -217,8 +217,6 @@
 	}
 }
 
-// BUG(cjyar) Allow extensions to specify extended structs with
-// corresponding namespaces via "func(xml.Name) Stanza".
 // BUG(cjyar) Allow extensions to provide filters in the form of "in
 // chan<- Stanza, out <-chan Stanza".
 func (cl *Client) readStream(srvIn <-chan interface{}, cliOut chan<- Stanza) {
@@ -556,6 +554,7 @@
 }
 
 // BUG(cjyar) This should use iq.nested rather than iq.generic.
+
 // Send a request to bind a resource. RFC 3920, section 7.
 func (cl *Client) bind(bind *Generic) {
 	res := cl.Jid.Resource

--- a/structs.go	Sat Dec 31 11:45:44 2011 -0700
+++ b/structs.go	Sat Dec 31 12:11:02 2011 -0700
@@ -76,6 +76,8 @@
 	Any *Generic
 }
 
+// BUG(cjyar) Change XTo() to GetTo(), etc.
+
 // One of the three core XMPP stanza types: iq, message, presence. See
 // RFC3920, section 9.
 type Stanza interface {
@@ -242,6 +244,9 @@
 	return buf.Bytes(), nil
 }
 
+// BUG(cjyar) We can probably eliminate this if we use an
+// appropriately-tagged XMLName field.
+
 func (e *errText) MarshalXML() ([]byte, os.Error) {
 	buf := bytes.NewBuffer(nil)
 	buf.WriteString("<text")
@@ -308,6 +313,8 @@
 	return buf.Bytes(), nil
 }
 
+// BUG(cjyar) We can probably eliminate this if we add an XMLName
+// field with an appropriate tag.
 func (er *Error) MarshalXML() ([]byte, os.Error) {
 	buf := bytes.NewBuffer(nil)
 	buf.WriteString("<error")