diff --git a/xep-0013.xml b/xep-0013.xml
index 3af41e49..04149445 100644
--- a/xep-0013.xml
+++ b/xep-0013.xml
@@ -129,10 +129,8 @@
 <iq type='result' 
     from='montague.net' 
     to='romeo@montague.net/orchard'>
-  <query xmlns='http://jabber.org/protocol/disco#info'/>
-    ...
+  <query xmlns='http://jabber.org/protocol/disco#info'>
     <feature var='http://jabber.org/protocol/offline'/>
-    ...
   </query>
 </iq>
     ]]></example>
@@ -243,7 +241,7 @@
 <iq type='set' id='remove1'>
   <offline xmlns='http://jabber.org/protocol/offline'>
     <item action='remove'
-          node='2003-02-27T22:49:17.008Z'
+          node='2003-02-27T22:49:17.008Z'/>
     <item action='remove'
           node='2003-02-27T22:52:37.225Z'/>
   </offline>
@@ -272,8 +270,6 @@
   </offline>
 </message>
 
-...
-
 <iq type='result' to='romeo@montague.net/orchard' id='fetch1'/>
     ]]></example>
     <p>A client MAY retrieve all messages without first requesting message headers. In this case, the server MUST return all of the user's offline messages and also MUST NOT send a flood of offline messages if the user subsequently sends initial presence to the server during this session. That is, the semantics here are the same as for requesting message headers.</p>
@@ -295,7 +291,7 @@
 </section1>
 <section1 topic='Protocol Flow' anchor='flow'>
   <p>This section shows the flow of protocol between client (C:) and server (S:) for the existing (flood) scenario and the improved (POP3-like) scenario.</p>
-    <example caption='Existing Protocol Flow (Flood)'><![CDATA[
+    <code><![CDATA[
 C: <stream:stream ...>
 
 S: <stream:stream ...>
@@ -310,9 +306,9 @@ S: send message flood to Client
 
 C: receive flood, send and receive messages, etc.
 
-... and so on]]></example>
+... and so on]]></code>
     <p>The semantics change with POP-like offline message handling, and server behavior changes as well...</p>
-    <example caption='Improved Protocol Flow (POP3-Like)'><![CDATA[
+    <code><![CDATA[
 C: <stream:stream ...>
 
 S: <stream:stream ...>
@@ -334,7 +330,7 @@ NOTE: Server does not flood Client with offline messages, but
 
 C: request and remove offline messages, send and receive messages, etc.
 
-... and so on]]></example>
+... and so on]]></code>
 </section1>
 <section1 topic='Security Considerations' anchor='sec'>
   <p>A server MUST NOT deliver a user's offline messages to any JID except one of the user's authorized resources.</p>