diff --git a/ps-rev/draft-ietf-core-coap-pubsub.html b/ps-rev/draft-ietf-core-coap-pubsub.html
index cb07e93..00dbbd6 100644
--- a/ps-rev/draft-ietf-core-coap-pubsub.html
+++ b/ps-rev/draft-ietf-core-coap-pubsub.html
@@ -1366,75 +1366,91 @@ <h3 id="name-coap-publish-subscribe-arch">
 <figure id="figure-1">
           <div id="section-1.2-3.1">
             <div class="alignCenter art-svg artwork" id="section-1.2-3.1.1">
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" height="272" width="512" viewBox="0 0 512 272" class="diagram" text-anchor="middle" font-family="monospace" font-size="13px" stroke-linecap="round">
-                <path d="M 400,64 L 400,80" fill="none" stroke="black"></path>
-                <path d="M 400,176 L 400,192" fill="none" stroke="black"></path>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" height="272" width="480" viewBox="0 0 480 272" class="diagram" text-anchor="middle" font-family="monospace" font-size="13px" stroke-linecap="round">
+                <path d="M 280,96 L 280,112" fill="none" stroke="black"></path>
+                <path d="M 280,208 L 280,240" fill="none" stroke="black"></path>
+                <path d="M 376,64 L 376,96" fill="none" stroke="black"></path>
+                <path d="M 376,176 L 376,208" fill="none" stroke="black"></path>
                 <path d="M 8,64 L 104,64" fill="none" stroke="black"></path>
-                <path d="M 200,64 L 288,64" fill="none" stroke="black"></path>
-                <path d="M 400,64 L 504,64" fill="none" stroke="black"></path>
+                <path d="M 192,64 L 280,64" fill="none" stroke="black"></path>
+                <path d="M 376,64 L 472,64" fill="none" stroke="black"></path>
+                <path d="M 288,80 L 376,80" fill="none" stroke="black"></path>
+                <path d="M 104,96 L 184,96" fill="none" stroke="black"></path>
+                <path d="M 280,96 L 368,96" fill="none" stroke="black"></path>
+                <path d="M 280,112 L 368,112" fill="none" stroke="black"></path>
                 <path d="M 8,128 L 104,128" fill="none" stroke="black"></path>
-                <path d="M 400,128 L 504,128" fill="none" stroke="black"></path>
+                <path d="M 376,128 L 472,128" fill="none" stroke="black"></path>
                 <path d="M 8,176 L 104,176" fill="none" stroke="black"></path>
-                <path d="M 400,176 L 504,176" fill="none" stroke="black"></path>
+                <path d="M 376,176 L 472,176" fill="none" stroke="black"></path>
+                <path d="M 288,192 L 376,192" fill="none" stroke="black"></path>
+                <path d="M 104,208 L 184,208" fill="none" stroke="black"></path>
+                <path d="M 280,208 L 368,208" fill="none" stroke="black"></path>
+                <path d="M 280,224 L 368,224" fill="none" stroke="black"></path>
                 <path d="M 8,240 L 104,240" fill="none" stroke="black"></path>
-                <path d="M 200,240 L 288,240" fill="none" stroke="black"></path>
-                <path d="M 400,240 L 504,240" fill="none" stroke="black"></path>
+                <path d="M 192,240 L 280,240" fill="none" stroke="black"></path>
+                <path d="M 376,240 L 472,240" fill="none" stroke="black"></path>
+                <polygon class="arrowhead" points="376,224 364,218.4 364,229.6" fill="black" transform="rotate(0,368,224)"></polygon>
+                <polygon class="arrowhead" points="376,208 364,202.4 364,213.6" fill="black" transform="rotate(0,368,208)"></polygon>
+                <polygon class="arrowhead" points="376,112 364,106.4 364,117.6" fill="black" transform="rotate(0,368,112)"></polygon>
+                <polygon class="arrowhead" points="376,96 364,90.4 364,101.6" fill="black" transform="rotate(0,368,96)"></polygon>
+                <polygon class="arrowhead" points="296,192 284,186.4 284,197.6" fill="black" transform="rotate(180,288,192)"></polygon>
+                <polygon class="arrowhead" points="296,80 284,74.4 284,85.6" fill="black" transform="rotate(180,288,80)"></polygon>
+                <polygon class="arrowhead" points="192,208 180,202.4 180,213.6" fill="black" transform="rotate(0,184,208)"></polygon>
+                <polygon class="arrowhead" points="192,96 180,90.4 180,101.6" fill="black" transform="rotate(0,184,96)"></polygon>
                 <g class="text">
                   <text x="36" y="36">CoAP</text>
                   <text x="244" y="36">CoAP</text>
-                  <text x="428" y="36">CoAP</text>
+                  <text x="412" y="36">CoAP</text>
                   <text x="48" y="52">clients</text>
                   <text x="244" y="52">server</text>
-                  <text x="440" y="52">clients</text>
-                  <text x="336" y="68">observe</text>
+                  <text x="424" y="52">clients</text>
+                  <text x="328" y="68">observe</text>
                   <text x="8" y="84">│</text>
                   <text x="104" y="84">│</text>
                   <text x="144" y="84">publish</text>
-                  <text x="200" y="84">│</text>
-                  <text x="340" y="84">│◀────────────</text>
-                  <text x="504" y="84">│</text>
+                  <text x="192" y="84">│</text>
+                  <text x="280" y="84">│</text>
+                  <text x="472" y="84">│</text>
                   <text x="8" y="100">│</text>
                   <text x="56" y="100">publisher</text>
-                  <text x="152" y="100">+──────────▶│</text>
-                  <text x="344" y="100">├────────────▶│</text>
-                  <text x="452" y="100">subscriber</text>
-                  <text x="504" y="100">│</text>
+                  <text x="192" y="100">├</text>
+                  <text x="424" y="100">subscribe</text>
+                  <text x="472" y="100">│</text>
                   <text x="8" y="116">│</text>
                   <text x="104" y="116">│</text>
-                  <text x="200" y="116">│</text>
-                  <text x="344" y="116">├────────────▶│</text>
-                  <text x="504" y="116">│</text>
-                  <text x="200" y="132">│</text>
-                  <text x="288" y="132">│</text>
-                  <text x="48" y="148">┄</text>
-                  <text x="200" y="148">│</text>
-                  <text x="244" y="148">broker</text>
-                  <text x="288" y="148">│</text>
-                  <text x="440" y="148">┄</text>
-                  <text x="48" y="164">┄</text>
-                  <text x="200" y="164">│</text>
-                  <text x="288" y="164">│</text>
-                  <text x="440" y="164">┄</text>
-                  <text x="200" y="180">│</text>
-                  <text x="288" y="180">│</text>
-                  <text x="336" y="180">observe</text>
+                  <text x="192" y="116">│</text>
+                  <text x="376" y="116">│</text>
+                  <text x="472" y="116">│</text>
+                  <text x="192" y="132">│</text>
+                  <text x="280" y="132">│</text>
+                  <text x="56" y="148">...</text>
+                  <text x="192" y="148">│</text>
+                  <text x="236" y="148">broker</text>
+                  <text x="280" y="148">│</text>
+                  <text x="424" y="148">...</text>
+                  <text x="56" y="164">...</text>
+                  <text x="192" y="164">│</text>
+                  <text x="280" y="164">│</text>
+                  <text x="424" y="164">...</text>
+                  <text x="192" y="180">│</text>
+                  <text x="280" y="180">│</text>
+                  <text x="328" y="180">observe</text>
                   <text x="8" y="196">│</text>
                   <text x="104" y="196">│</text>
                   <text x="144" y="196">publish</text>
-                  <text x="200" y="196">│</text>
-                  <text x="340" y="196">│◀────────────</text>
-                  <text x="504" y="196">│</text>
+                  <text x="192" y="196">│</text>
+                  <text x="280" y="196">│</text>
+                  <text x="472" y="196">│</text>
                   <text x="8" y="212">│</text>
                   <text x="56" y="212">publisher</text>
-                  <text x="152" y="212">+──────────▶│</text>
-                  <text x="344" y="212">├────────────▶│</text>
-                  <text x="452" y="212">subscriber</text>
-                  <text x="504" y="212">│</text>
+                  <text x="192" y="212">│</text>
+                  <text x="424" y="212">subscribe</text>
+                  <text x="472" y="212">│</text>
                   <text x="8" y="228">│</text>
                   <text x="104" y="228">│</text>
-                  <text x="200" y="228">│</text>
-                  <text x="344" y="228">├────────────▶│</text>
-                  <text x="504" y="228">│</text>
+                  <text x="192" y="228">│</text>
+                  <text x="376" y="228">│</text>
+                  <text x="472" y="228">│</text>
                 </g>
               </svg><a href="#section-1.2-3.1.1" class="pilcrow">¶</a>
 </div>
@@ -2139,39 +2155,39 @@ <h3 id="name-topic-data-interactions">
 <figure id="figure-5">
           <div id="section-2.7-3.1">
             <div class="alignCenter art-svg artwork" id="section-2.7-3.1.1">
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" height="416" width="544" viewBox="0 0 544 416" class="diagram" text-anchor="middle" font-family="monospace" font-size="13px" stroke-linecap="round">
-                <path d="M 208,224 L 208,296" fill="none" stroke="black"></path>
-                <path d="M 188,312 L 196,328" fill="none" stroke="black"></path>
-                <path d="M 116,120 L 124,136" fill="none" stroke="black"></path>
-                <path d="M 188,232 L 196,248" fill="none" stroke="black"></path>
-                <path d="M 220,296 L 228,312" fill="none" stroke="black"></path>
-                <path d="M 160,144 L 196,216" fill="none" stroke="black"></path>
-                <path d="M 148,104 L 156,120" fill="none" stroke="black"></path>
-                <path d="M 220,216 L 228,232" fill="none" stroke="black"></path>
-                <path d="M 276,232 L 284,248" fill="none" stroke="black"></path>
-                <path d="M 260,168 L 284,216" fill="none" stroke="black"></path>
-                <path d="M 308,216 L 316,232" fill="none" stroke="black"></path>
-                <path d="M 404,232 L 412,248" fill="none" stroke="black"></path>
-                <path d="M 436,216 L 444,232" fill="none" stroke="black"></path>
-                <path d="M 116,120 L 124,104" fill="none" stroke="black"></path>
-                <path d="M 148,136 L 156,120" fill="none" stroke="black"></path>
-                <path d="M 188,232 L 196,216" fill="none" stroke="black"></path>
-                <path d="M 188,312 L 196,296" fill="none" stroke="black"></path>
-                <path d="M 220,248 L 228,232" fill="none" stroke="black"></path>
-                <path d="M 220,328 L 228,312" fill="none" stroke="black"></path>
-                <path d="M 276,232 L 284,216" fill="none" stroke="black"></path>
-                <path d="M 308,248 L 316,232" fill="none" stroke="black"></path>
-                <path d="M 404,232 L 412,216" fill="none" stroke="black"></path>
-                <path d="M 436,248 L 444,232" fill="none" stroke="black"></path>
-                <path d="M 124,104 L 148,104" fill="none" stroke="black"></path>
-                <path d="M 124,136 L 148,136" fill="none" stroke="black"></path>
-                <path d="M 172,168 L 260,168" fill="none" stroke="black"></path>
-                <path d="M 196,216 L 220,216" fill="none" stroke="black"></path>
-                <path d="M 284,216 L 308,216" fill="none" stroke="black"></path>
-                <path d="M 412,216 L 436,216" fill="none" stroke="black"></path>
-                <path d="M 284,248 L 308,248" fill="none" stroke="black"></path>
-                <path d="M 412,248 L 436,248" fill="none" stroke="black"></path>
-                <path d="M 196,328 L 220,328" fill="none" stroke="black"></path>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" height="368" width="544" viewBox="0 0 544 368" class="diagram" text-anchor="middle" font-family="monospace" font-size="13px" stroke-linecap="round">
+                <path d="M 208,208 L 208,280" fill="none" stroke="black"></path>
+                <path d="M 188,296 L 196,312" fill="none" stroke="black"></path>
+                <path d="M 116,104 L 124,120" fill="none" stroke="black"></path>
+                <path d="M 188,216 L 196,232" fill="none" stroke="black"></path>
+                <path d="M 220,280 L 228,296" fill="none" stroke="black"></path>
+                <path d="M 160,128 L 196,200" fill="none" stroke="black"></path>
+                <path d="M 148,88 L 156,104" fill="none" stroke="black"></path>
+                <path d="M 220,200 L 228,216" fill="none" stroke="black"></path>
+                <path d="M 276,216 L 284,232" fill="none" stroke="black"></path>
+                <path d="M 260,152 L 284,200" fill="none" stroke="black"></path>
+                <path d="M 308,200 L 316,216" fill="none" stroke="black"></path>
+                <path d="M 404,216 L 412,232" fill="none" stroke="black"></path>
+                <path d="M 436,200 L 444,216" fill="none" stroke="black"></path>
+                <path d="M 116,104 L 124,88" fill="none" stroke="black"></path>
+                <path d="M 148,120 L 156,104" fill="none" stroke="black"></path>
+                <path d="M 188,216 L 196,200" fill="none" stroke="black"></path>
+                <path d="M 188,296 L 196,280" fill="none" stroke="black"></path>
+                <path d="M 220,232 L 228,216" fill="none" stroke="black"></path>
+                <path d="M 220,312 L 228,296" fill="none" stroke="black"></path>
+                <path d="M 276,216 L 284,200" fill="none" stroke="black"></path>
+                <path d="M 308,232 L 316,216" fill="none" stroke="black"></path>
+                <path d="M 404,216 L 412,200" fill="none" stroke="black"></path>
+                <path d="M 436,232 L 444,216" fill="none" stroke="black"></path>
+                <path d="M 124,88 L 148,88" fill="none" stroke="black"></path>
+                <path d="M 124,120 L 148,120" fill="none" stroke="black"></path>
+                <path d="M 172,152 L 260,152" fill="none" stroke="black"></path>
+                <path d="M 196,200 L 220,200" fill="none" stroke="black"></path>
+                <path d="M 284,200 L 308,200" fill="none" stroke="black"></path>
+                <path d="M 412,200 L 436,200" fill="none" stroke="black"></path>
+                <path d="M 284,232 L 308,232" fill="none" stroke="black"></path>
+                <path d="M 412,232 L 436,232" fill="none" stroke="black"></path>
+                <path d="M 196,312 L 220,312" fill="none" stroke="black"></path>
                 <g class="text">
                   <text x="84" y="36">CoAP</text>
                   <text x="132" y="36">server</text>
@@ -2198,126 +2214,123 @@ <h3 id="name-topic-data-interactions">
                   <text x="296" y="68">─</text>
                   <text x="312" y="68">─</text>
                   <text x="328" y="68">─</text>
-                  <text x="344" y="68">─</text>
-                  <text x="352" y="84">│</text>
-                  <text x="8" y="100">│</text>
-                  <text x="428" y="100">CoAP</text>
-                  <text x="476" y="100">server</text>
-                  <text x="512" y="100">2</text>
-                  <text x="64" y="116">Topic</text>
-                  <text x="352" y="116">│</text>
-                  <text x="464" y="116">[2001:db8::2:1]</text>
-                  <text x="8" y="132">│</text>
-                  <text x="68" y="132">Collection</text>
-                  <text x="68" y="148">Resource</text>
-                  <text x="352" y="148">│</text>
-                  <text x="384" y="148">┌</text>
-                  <text x="400" y="148">─</text>
-                  <text x="416" y="148">─</text>
-                  <text x="432" y="148">─</text>
-                  <text x="448" y="148">─</text>
-                  <text x="464" y="148">─</text>
-                  <text x="480" y="148">─</text>
-                  <text x="496" y="148">─</text>
-                  <text x="512" y="148">─</text>
-                  <text x="528" y="148">─</text>
-                  <text x="8" y="164">│</text>
-                  <text x="536" y="164">│</text>
-                  <text x="352" y="180">│</text>
-                  <text x="384" y="180">│</text>
-                  <text x="8" y="196">│</text>
-                  <text x="220" y="196">......</text>
-                  <text x="308" y="196">......</text>
-                  <text x="424" y="196">.........</text>
-                  <text x="536" y="196">│</text>
+                  <text x="348" y="68">─.</text>
+                  <text x="8" y="84">│</text>
+                  <text x="428" y="84">CoAP</text>
+                  <text x="476" y="84">server</text>
+                  <text x="512" y="84">2</text>
+                  <text x="64" y="100">Topic</text>
+                  <text x="352" y="100">│</text>
+                  <text x="464" y="100">[2001:db8::2:1]</text>
+                  <text x="8" y="116">│</text>
+                  <text x="68" y="116">Collection</text>
+                  <text x="68" y="132">Resource</text>
+                  <text x="352" y="132">│</text>
+                  <text x="384" y="132">┌</text>
+                  <text x="400" y="132">─</text>
+                  <text x="416" y="132">─</text>
+                  <text x="432" y="132">─</text>
+                  <text x="448" y="132">─</text>
+                  <text x="464" y="132">─</text>
+                  <text x="480" y="132">─</text>
+                  <text x="496" y="132">─</text>
+                  <text x="512" y="132">─</text>
+                  <text x="528" y="132">─</text>
+                  <text x="8" y="148">│</text>
+                  <text x="536" y="148">│</text>
+                  <text x="352" y="164">│</text>
+                  <text x="384" y="164">│</text>
+                  <text x="8" y="180">│</text>
+                  <text x="220" y="180">......</text>
+                  <text x="308" y="180">......</text>
+                  <text x="424" y="180">.........</text>
+                  <text x="536" y="180">│</text>
+                  <text x="176" y="196">:</text>
+                  <text x="240" y="196">:</text>
+                  <text x="264" y="196">:</text>
+                  <text x="328" y="196">:</text>
+                  <text x="352" y="196">│</text>
+                  <text x="388" y="196">│:</text>
+                  <text x="456" y="196">:</text>
+                  <text x="488" y="196">Topic</text>
+                  <text x="8" y="212">│</text>
+                  <text x="136" y="212">Topic</text>
                   <text x="176" y="212">:</text>
                   <text x="240" y="212">:</text>
                   <text x="264" y="212">:</text>
-                  <text x="328" y="212">:</text>
-                  <text x="352" y="212">│</text>
-                  <text x="388" y="212">│:</text>
+                  <text x="360" y="212">───────────</text>
                   <text x="456" y="212">:</text>
-                  <text x="488" y="212">Topic</text>
-                  <text x="8" y="228">│</text>
-                  <text x="136" y="228">Topic</text>
+                  <text x="484" y="212">Data</text>
+                  <text x="536" y="212">│</text>
+                  <text x="124" y="228">Resource</text>
                   <text x="176" y="228">:</text>
+                  <text x="200" y="228">_</text>
+                  <text x="216" y="228">_</text>
                   <text x="240" y="228">:</text>
                   <text x="264" y="228">:</text>
-                  <text x="360" y="228">───────────</text>
+                  <text x="328" y="228">:</text>
+                  <text x="352" y="228">│</text>
+                  <text x="388" y="228">│:</text>
                   <text x="456" y="228">:</text>
-                  <text x="484" y="228">Data</text>
-                  <text x="536" y="228">│</text>
-                  <text x="124" y="244">Resource</text>
-                  <text x="176" y="244">:</text>
-                  <text x="200" y="244">_</text>
-                  <text x="216" y="244">_</text>
-                  <text x="240" y="244">:</text>
-                  <text x="264" y="244">:</text>
-                  <text x="328" y="244">:</text>
-                  <text x="352" y="244">│</text>
-                  <text x="388" y="244">│:</text>
-                  <text x="456" y="244">:</text>
-                  <text x="500" y="244">Resource</text>
-                  <text x="8" y="260">│</text>
+                  <text x="500" y="228">Resource</text>
+                  <text x="8" y="244">│</text>
+                  <text x="188" y="244">....</text>
+                  <text x="228" y="244">....</text>
+                  <text x="296" y="244">.........</text>
+                  <text x="424" y="244">:.......:</text>
+                  <text x="536" y="244">│</text>
                   <text x="188" y="260">....</text>
                   <text x="228" y="260">....</text>
-                  <text x="296" y="260">.........</text>
-                  <text x="424" y="260">:.......:</text>
-                  <text x="536" y="260">│</text>
-                  <text x="188" y="276">....</text>
-                  <text x="228" y="276">....</text>
-                  <text x="352" y="276">│</text>
-                  <text x="384" y="276">│</text>
-                  <text x="8" y="292">│</text>
-                  <text x="136" y="292">Topic</text>
+                  <text x="352" y="260">│</text>
+                  <text x="384" y="260">│</text>
+                  <text x="8" y="276">│</text>
+                  <text x="136" y="276">Topic</text>
+                  <text x="176" y="276">:</text>
+                  <text x="200" y="276">_</text>
+                  <text x="216" y="276">_</text>
+                  <text x="240" y="276">:</text>
+                  <text x="392" y="276">─</text>
+                  <text x="408" y="276">─</text>
+                  <text x="424" y="276">─</text>
+                  <text x="440" y="276">─</text>
+                  <text x="456" y="276">─</text>
+                  <text x="472" y="276">─</text>
+                  <text x="488" y="276">─</text>
+                  <text x="504" y="276">─</text>
+                  <text x="520" y="276">─</text>
+                  <text x="536" y="276">┘</text>
+                  <text x="140" y="292">Data</text>
                   <text x="176" y="292">:</text>
-                  <text x="200" y="292">_</text>
-                  <text x="216" y="292">_</text>
                   <text x="240" y="292">:</text>
-                  <text x="392" y="292">─</text>
-                  <text x="408" y="292">─</text>
-                  <text x="424" y="292">─</text>
-                  <text x="440" y="292">─</text>
-                  <text x="456" y="292">─</text>
-                  <text x="472" y="292">─</text>
-                  <text x="488" y="292">─</text>
-                  <text x="504" y="292">─</text>
-                  <text x="520" y="292">─</text>
-                  <text x="536" y="292">┘</text>
-                  <text x="140" y="308">Data</text>
+                  <text x="352" y="292">│</text>
+                  <text x="8" y="308">│</text>
+                  <text x="124" y="308">Resource</text>
                   <text x="176" y="308">:</text>
                   <text x="240" y="308">:</text>
-                  <text x="352" y="308">│</text>
-                  <text x="8" y="324">│</text>
-                  <text x="124" y="324">Resource</text>
-                  <text x="176" y="324">:</text>
-                  <text x="240" y="324">:</text>
-                  <text x="208" y="340">:.......:</text>
-                  <text x="352" y="340">│</text>
-                  <text x="8" y="356">│</text>
-                  <text x="352" y="372">│</text>
-                  <text x="8" y="388">└</text>
-                  <text x="24" y="388">─</text>
-                  <text x="40" y="388">─</text>
-                  <text x="56" y="388">─</text>
-                  <text x="72" y="388">─</text>
-                  <text x="88" y="388">─</text>
-                  <text x="104" y="388">─</text>
-                  <text x="120" y="388">─</text>
-                  <text x="136" y="388">─</text>
-                  <text x="152" y="388">─</text>
-                  <text x="168" y="388">─</text>
-                  <text x="184" y="388">─</text>
-                  <text x="200" y="388">─</text>
-                  <text x="216" y="388">─</text>
-                  <text x="232" y="388">─</text>
-                  <text x="248" y="388">─</text>
-                  <text x="264" y="388">─</text>
-                  <text x="280" y="388">─</text>
-                  <text x="296" y="388">─</text>
-                  <text x="312" y="388">─</text>
-                  <text x="328" y="388">─</text>
-                  <text x="344" y="388">─</text>
+                  <text x="208" y="324">:.......:</text>
+                  <text x="352" y="324">│</text>
+                  <text x="8" y="340">.</text>
+                  <text x="24" y="340">─</text>
+                  <text x="40" y="340">─</text>
+                  <text x="56" y="340">─</text>
+                  <text x="72" y="340">─</text>
+                  <text x="88" y="340">─</text>
+                  <text x="104" y="340">─</text>
+                  <text x="120" y="340">─</text>
+                  <text x="136" y="340">─</text>
+                  <text x="152" y="340">─</text>
+                  <text x="168" y="340">─</text>
+                  <text x="184" y="340">─</text>
+                  <text x="200" y="340">─</text>
+                  <text x="216" y="340">─</text>
+                  <text x="232" y="340">─</text>
+                  <text x="248" y="340">─</text>
+                  <text x="264" y="340">─</text>
+                  <text x="280" y="340">─</text>
+                  <text x="296" y="340">─</text>
+                  <text x="312" y="340">─</text>
+                  <text x="328" y="340">─</text>
+                  <text x="348" y="340">─┘</text>
                 </g>
               </svg><a href="#section-2.7-3.1.1" class="pilcrow">¶</a>
 </div>
diff --git a/ps-rev/draft-ietf-core-coap-pubsub.txt b/ps-rev/draft-ietf-core-coap-pubsub.txt
index 281ec15..9e80854 100644
--- a/ps-rev/draft-ietf-core-coap-pubsub.txt
+++ b/ps-rev/draft-ietf-core-coap-pubsub.txt
@@ -224,20 +224,20 @@ Table of Contents
    resource will receive notifications, the delivery of which is done on
    a best-effort basis.
 
-         CoAP                      CoAP                   CoAP
-         clients                  server                  clients
-       +-----------.           +----------+  observe    +------------+
-       │           │ publish   │          │◀────────────+            │
-       │ publisher +──────────▶│          ├────────────▶│ subscriber │
-       │           │           │          ├────────────▶│            │
-       +-----------+           │          │             +------------+
-            ┄                  │  broker  │                  ┄
-            ┄                  │          │                  ┄
-       +-----------+           │          │  observe    +------------+
-       │           │ publish   │          │◀────────────+            │
-       │ publisher +──────────▶│          ├────────────▶│ subscriber │
-       │           │           │          ├────────────▶│            │
-       +-----------+           +----------+             +------------+
+           CoAP                      CoAP                 CoAP
+           clients                  server                clients
+         +-----------.          +----------+  observe  +-----------+
+         │           │ publish  │          │<----------+           │
+         │ publisher +--------->├          +---------->| subscribe │
+         │           │          │          +---------->│           │
+         +-----------+          │          │           +-----------+
+              ...               │  broker  │                ...
+              ...               │          │                ...
+         +-----------+          │          │  observe  +-----------+
+         │           │ publish  │          │<----------+           │
+         │ publisher +--------->│          +---------->| subscribe │
+         │           │          │          +---------->│           │
+         +-----------+          +----------+           +-----------+
 
              Figure 1: Publish-subscribe architecture over CoAP
 
@@ -825,8 +825,7 @@ Table of Contents
 
             CoAP server 1
            [central-ps.example.com]
-    ┌ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─
-                                               │
+    ┌ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─.
     │              ___                                 CoAP server 2
          Topic    /   \                        │      [2001:db8::2:1]
     │  Collection \___/
@@ -843,9 +842,7 @@ Table of Contents
                    Data  : /   \ :             │
     │          Resource  : \___/ :
                          :.......:             │
-    │
-                                               │
-    └ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─
+    . ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─┘
 
                    Figure 5: topic data hosted externally