diff --git a/xep-0060.xml b/xep-0060.xml
index eecd546b..85ce0079 100644
--- a/xep-0060.xml
+++ b/xep-0060.xml
@@ -6,6 +6,40 @@
 <!ENTITY ITEMS "&lt;items/&gt;">
 <!ENTITY PUBSUB "&lt;pubsub/&gt;">
 ]>
+<!--
+
+TODO
+
+- inconsistency?
+
+  <subscribe>
+    <options/>
+  </subscribe>
+
+  <iq type='error|result'>
+    <subscribe-options/>
+  </iq>
+
+- no <item/> on publish
+
+- new error conditions
+  <invalid-nodeid/>
+  <invalid-itemim/>
+
+- modify affiliations: no ability to add an owner
+
+- clarify addressing
+  - JID vs. JID + node
+  - why not allow topic to be localpart?
+  - note precedence of 'resource' over 'node'
+
+- get-items on subscribe (fix race condition)
+
+- clarify whether or not a retract notification is sent
+  when the service implicitly deletes an item (e.g., when
+  max-items is exceeded)
+
+-->
 <?xml-stylesheet type='text/xsl' href='xep.xsl'?>
 <xep>
 <header>
@@ -14,6 +48,7 @@
   &LEGALNOTICE;
   <number>0060</number>
   <status>Draft</status>
+  <interim/>
   <type>Standards Track</type>
   <sig>Standards</sig>
   <dependencies>
@@ -7090,7 +7125,7 @@ xmpp:pubsub.shakespeare.lit?pubsub;action=retrieve;node=princely_musings
 </section1>
 
 <section1 topic='Acknowledgements' anchor='ack'>
-  <p>Thanks to Kirk Bateman, Robin Collier, Blaine Cook, Ovidiu Craciun, Brian Cully, Dave Cridland, Guillaume Desmottes, Gaston Dombiak, William Edney, Seth Fitzsimmons, Fabio Forno, Nathan Fritz, Julien Genestoux, Anastasia Gornostaeva, Joe Hildebrand, Curtis King, Tuomas Koski, Petri Liimatta, Tobias Markmann, Pedro Melo, Dirk Meyer, Tory Patnoe, Peter Petrov, Christophe Romain, Pavel Šimerda, Andy Skelton, Kevin Smith, Chris Teegarden, Simon Tennant, Matt Tucker, Matthew Wild, Bob Wyman, Matus Zamborsky, and Brett Zamir for their feedback.</p>
+  <p>Thanks to Kirk Bateman, Robin Collier, Blaine Cook, Ovidiu Craciun, Brian Cully, Dave Cridland, Guillaume Desmottes, Gaston Dombiak, William Edney, Seth Fitzsimmons, Fabio Forno, Nathan Fritz, Julien Genestoux, Anastasia Gornostaeva, Joe Hildebrand, Curtis King, Tuomas Koski, Petri Liimatta, Tobias Markmann, Pedro Melo, Dirk Meyer, Tory Patnoe, Peter Petrov, Sonny Piers, Christophe Romain, Pavel Šimerda, Andy Skelton, Kevin Smith, Chris Teegarden, Simon Tennant, Matt Tucker, Matthew Wild, Bob Wyman, Matus Zamborsky, and Brett Zamir for their feedback.</p>
 </section1>
 
 <section1 topic='Author Note' anchor='authornote'>