diff --git a/xep-0060.xml b/xep-0060.xml
index 7950b2b0..7919e8ef 100644
--- a/xep-0060.xml
+++ b/xep-0060.xml
@@ -1948,7 +1948,6 @@ And by opposing end them?
           <value>away</value>
         </field>
       </x>
-    </options>
     </default>
   </pubsub>
 </iq>
@@ -4385,7 +4384,7 @@ And by opposing end them?
 <iq type='error'
     from='pubsub.shakespeare.lit'
     to='hamlet@denmark.lit/elsinore'
-    id='subman3'/>
+    id='subman3'>
   <error type='modify'>
     <not-acceptable xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>
   </error>
@@ -4597,7 +4596,7 @@ And by opposing end them?
 <iq type='error'
     from='pubsub.shakespeare.lit'
     to='hamlet@denmark.lit/elsinore'
-    id='ent3'/>
+    id='ent3'>
   <error type='modify'>
     <not-acceptable xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>
   </error>
@@ -4716,7 +4715,7 @@ And by opposing end them?
     <p>The server shall also query the identity+features for &lt;romeo@montague.lit&gt;:</p>
     <example caption='Account server queries contact'><![CDATA[
 <iq from='juliet@capulet.lit'
-    to='romeo@montague.lit/orchard
+    to='romeo@montague.lit/orchard'
     type='get'
     id='disco234'>
   <query xmlns='http://jabber.org/protocol/disco#info'/>
@@ -5235,7 +5234,7 @@ And by opposing end them?
   </section2>
 
   <section2 topic='IQ Notifications' anchor='impl-iqnotify'>
-    <p>If the pubsub service supports presence-based delivery and a node is configured to enable such delivery, the service MAY offer a value of "iq" for the "pubsub#notification_type" node configuration option. If this value is chosen, the service shall deliver notifications in XMPP IQ stanzas instead of in XMPP message stanzas. Because IQ stanzas are addressed to full JIDs &LOCALFULL;, if the service does not know the full JID of a given subscriber then it SHOULD NOT send an event notification at all (just as it would not for presence-based delivery via &MESSAGE; stanzas). The IQ stanza containing an event notification shall be of type "set", and in accordance with the semantics of the IQ stanza defined in <cite>RFC 3920</cite> the recipient MUST return either an IQ stanza of type "result" or an IQ stanza of type "error". An example follows</p>
+    <p>If the pubsub service supports presence-based delivery and a node is configured to enable such delivery, the service MAY offer a value of "iq" for the "pubsub#notification_type" node configuration option. If this value is chosen, the service shall deliver notifications in XMPP IQ stanzas instead of in XMPP message stanzas. Because IQ stanzas are addressed to full JIDs &LOCALFULL;, if the service does not know the full JID of a given subscriber then it SHOULD NOT send an event notification at all (just as it would not for presence-based delivery via &MESSAGE; stanzas). The IQ stanza containing an event notification shall be of type "set", and in accordance with the semantics of the IQ stanza defined in <cite>RFC 3920</cite> the recipient MUST return either an IQ stanza of type "result" or an IQ stanza of type "error". An example follows.</p>
     <example caption='Service Notifies Subscriber via IQ'><![CDATA[
 <iq from='pubsub.shakespeare.lit'
     id='jc9jn253'