diff --git a/xep-0024.xml b/xep-0024.xml
index ec6a4424..f1a1a84b 100644
--- a/xep-0024.xml
+++ b/xep-0024.xml
@@ -276,6 +276,7 @@ SEND: <iq type='set' to='pubsub.localhost'
         <query xmlns='jabber:iq:pubsub'>
           <unsubscribe to='publisher'>
             <ns>namespace:1</ns>
+          </unsubscribe>
         </query>
       </iq>
 
@@ -284,6 +285,7 @@ RECV: <iq type='result' from='pubsub.localhost'
         <query xmlns='jabber:iq:pubsub'>
           <unsubscribe to='publisher'>
             <ns>namespace:1</ns>
+          </unsubscribe>
         </query>
       </iq>
 </example>
@@ -541,22 +543,22 @@ SEND: &lt;iq type='get' to='pubsub.localhost'
         &lt;/query&gt;
       &lt;/iq&gt;
 
-RECV: &gt;iq type='result' from='pubsub.localhost'
+RECV: &lt;iq type='result' from='pubsub.localhost'
              to='subscriber@localhost/resource' id='s1'&gt;
-        &gt;query xmlns='jabber:iq:pubsub'&gt;
-          &gt;subscribe&gt;
-            &gt;ns&gt;namespace:1&gt;/ns&gt;
-            &gt;ns&gt;namespace:2&gt;/ns&gt;
-          &gt;/subscribe&gt;
-          &gt;subscribe to='publisherA'&gt;
-            &gt;ns&gt;namespace:2&gt;/ns&gt;
-            &gt;ns&gt;namespace:4&gt;/ns&gt;
-          &gt;/subscribe&gt;
-          &gt;subscribe to='publisherB'&gt;
-            &gt;ns&gt;namespace:5&gt;/ns&gt;
-          &gt;/subscribe&gt;
-        &gt;/query&gt;
-      &gt;/iq&gt;
+        &lt;query xmlns='jabber:iq:pubsub'&gt;
+          &lt;subscribe&gt;
+            &lt;ns&gt;namespace:1&lt;/ns&gt;
+            &lt;ns&gt;namespace:2&lt;/ns&gt;
+          &lt;/subscribe&gt;
+          &lt;subscribe to='publisherA'&gt;
+            &lt;ns&gt;namespace:2&lt;/ns&gt;
+            &lt;ns&gt;namespace:4&lt;/ns&gt;
+          &lt;/subscribe&gt;
+          &lt;subscribe to='publisherB'&gt;
+            &lt;ns&gt;namespace:5&lt;/ns&gt;
+          &lt;/subscribe&gt;
+        &lt;/query&gt;
+      &lt;/iq&gt;
 </example>
 
 <p>
@@ -586,7 +588,7 @@ A publisher can publish information within a certain namespace, like this:
 SEND: &lt;iq type='set' to='pubsub.localhost'
              from='publisher@localhost/resource' id='s1'&gt;
         &lt;query xmlns='jabber:iq:pubsub'&gt;
-          &lt;publish ns='foo'/&gt;
+          &lt;publish ns='foo'&gt;
             &lt;foo xmlns='foo'&gt;bar&lt;/foo&gt;
           &lt;/publish&gt;
         &lt;/query&gt;
@@ -595,7 +597,7 @@ SEND: &lt;iq type='set' to='pubsub.localhost'
 RECV: &lt;iq type='result' from='pubsub.localhost'
              to='publisher@localhost/resource' id='s1'&gt;
         &lt;query xmlns='jabber:iq:pubsub'&gt;
-          &lt;publish ns='foo'/&gt;
+          &lt;publish ns='foo'&gt;
             &lt;foo xmlns='foo'&gt;bar&lt;/foo&gt;
           &lt;/publish&gt;
         &lt;/query&gt;
@@ -611,14 +613,14 @@ like this:
 SEND: &lt;iq type='set' to='pubsub.localhost'
              from='publisher.localhost' id='s1'&gt;
         &lt;query xmlns='jabber:iq:pubsub'&gt;
-          &lt;publish ns='foo'/&gt;
+          &lt;publish ns='foo'&gt;
             &lt;foo xmlns='foo'&gt;bar&lt;/foo&gt;
           &lt;/publish&gt;
-          &lt;publish ns='jabber:x:oob'/&gt;
+          &lt;publish ns='jabber:x:oob'&gt;
             &lt;x xmlns='jabber:x:oob'&gt;
               &lt;url&gt;http://www.pipetree.com/jabber/&lt;/url&gt;
               &lt;desc&gt;Some stuff about Jabber&lt;/desc&gt;
-            &gt;
+            &lt;/x&gt;
           &lt;/publish&gt;
         &lt;/query&gt;
       &lt;/iq&gt;
@@ -626,14 +628,14 @@ SEND: &lt;iq type='set' to='pubsub.localhost'
 RECV: &lt;iq type='result' from='pubsub.localhost'
              to='publisher.localhost' id='s1'&gt;
         &lt;query xmlns='jabber:iq:pubsub'&gt;
-          &lt;publish ns='foo'/&gt;
+          &lt;publish ns='foo'&gt;
             &lt;foo xmlns='foo'&gt;bar&lt;/foo&gt;
           &lt;/publish&gt;
-          &lt;publish ns='jabber:x:oob'/&gt;
+          &lt;publish ns='jabber:x:oob'&gt;
             &lt;x xmlns='jabber:x:oob'&gt;
               &lt;url&gt;http://www.pipetree.com/jabber/&lt;/url&gt;
               &lt;desc&gt;Some stuff about Jabber&lt;/desc&gt;
-            &gt;
+            &lt;/x&gt;
           &lt;/publish&gt;
         &lt;/query&gt;
       &lt;/iq&gt;
@@ -697,7 +699,7 @@ must send to push this foo data out to a subscriber.
 SEND: &lt;iq type='set' to='subscriber@localhost/foosink'
              from='pubsub.localhost' id='push1'&gt;
         &lt;query xmlns='jabber:iq:pubsub'&gt;
-          &lt;publish ns='foo' from='publisher@localhost'/&gt;
+          &lt;publish ns='foo' from='publisher@localhost'&gt;
             &lt;foo xmlns='foo'&gt;bar&lt;/foo&gt;
           &lt;/publish&gt;
         &lt;/query&gt;