diff --git a/xep-0355.xml b/xep-0355.xml
index 3a4724a5..3530c4ae 100644
--- a/xep-0355.xml
+++ b/xep-0355.xml
@@ -28,7 +28,14 @@
     <email>goffi@goffi.org</email>
     <jid>goffi@jabber.fr</jid>
   </author>
-  
+
+  <revision>
+    <version>0.2.1</version>
+    <date>2015-10-15</date>
+    <initials>XEP Editor (mam)</initials>
+    <remark><p>Corrected examples (Stefan Strigler).</p></remark>
+  </revision>
+
   <revision>
     <version>0.2</version>
     <date>2014-03-21</date>
@@ -48,14 +55,14 @@
         </ul>
     </remark>
   </revision>
-  
+
   <revision>
     <version>0.1</version>
     <date>2014-12-18</date>
     <initials>XEP Editor (mam)</initials>
     <remark><p>Initial published version approved by the XMPP Council.</p></remark>
   </revision>
-  
+
   <revision>
     <version>0.0.1</version>
     <date>2014-11-13</date>
@@ -95,7 +102,7 @@
 <section1 topic='Admin Mode Use Cases' anchor='admin_usecases'>
 
     <section2 topic='Server Allows Namespaces Delegations' anchor='server_config'>
-        <p>Namespaces delegations are granted in the server configuration. Only &IQ; stanza namespaces can be delegated.</p> 
+        <p>Namespaces delegations are granted in the server configuration. Only &IQ; stanza namespaces can be delegated.</p>
         <p>A feature is delegated using:</p>
         <ol>
             <li>it's namespace: e.g. <em>'urn:xmpp:mam:0'</em></li>
@@ -107,11 +114,11 @@
     <section2 topic='Delegation Request Use Case' anchor='admin_perm'>
         <p>Once the managing entity is authenticated and stream is started, the server send it a &MESSAGE; stanza with a &lt;delegation/&gt; elements which MUST have the <strong>'urn:xmpp:delegation:1'</strong> namespace. This element contains &lt;delegated/&gt; elements which MUST contain a 'namespace' attribute indicating the delegated namespace. If there is additional attribute filtering, the &lt;delegated/&gt; can have children &lt;attribute/&gt; elements which MUST contain a 'name' attribute with the name of the filtering attribute.</p>
         <example caption='server advertise delegated namespaces'><![CDATA[
-<message from='capulet.net' to='pubub.capulet.lit' id='12345'>
+<message from='capulet.lit' to='pubub.capulet.lit' id='12345'>
     <delegation xmlns='urn:xmpp:delegation:1'>
         <delegated namespace='urn:xmpp:mam:0'>
             <attribute name='node' />
-        <delegated/>
+        </delegated>
         <delegated namespace='http://jabber.org/protocol/pubsub'/>
     </delegation>
 </message>
@@ -166,7 +173,7 @@
 </iq>
 ]]></example>
 <p>The managing entity replies to the stanza by encapsulating its &IQ; result in the same way:</p>
-<example caption='pubsub.capulet.lit replies badly to juliet'><![CDATA[
+<example caption='pubsub.capulet.lit replies to juliet'><![CDATA[
 <iq from='pubsub.capulet.lit'
     to='capulet.lit'
     id='delegate1'
@@ -292,7 +299,7 @@
         <p>In <em>client</em> mode, the managing entity is not certified by the server administrator, so the delegation MUST be <strong>explicitly</strong> allowed by the managed entity. This is initiated by the managing entity (it can be after an interaction with a managed entity, like a subscription).</p>
         <p>To request delegation for a particular entity, the managing entity MUST have an &IQ; stanza with <em>'urn:xmpp:delegation:1'</em> namespace. The &QUERY; element MUST have a 'to' attribute which specify the entity it wants to manage.</p>
         <p>Namespace delegations are asked with a &lt;delegate/&gt; element, which MUST contain a 'namespace' attribute set to the requested namespace.</p>
-        
+
         <p>If an entity want to manage PEP service for Juliet, it can ask the delegation like this:
         </p>
         <example caption='managing entity asks for namespace delegation for one particular entity'><![CDATA[