diff --git a/draft-ietf-mls-architecture.html b/draft-ietf-mls-architecture.html
index e636cde..47e4b9a 100644
--- a/draft-ietf-mls-architecture.html
+++ b/draft-ietf-mls-architecture.html
@@ -670,7 +670,7 @@
 }
 #toc nav li {
   line-height: 1.3em;
-  margin: 0.75em 0;
+  margin: 2px 0;
   padding-left: 1.2em;
   text-indent: -1.2em;
 }
@@ -763,7 +763,7 @@
     z-index: 2;
     top: 0;
     right: 0;
-    padding: 0;
+    padding: 1px 0 0 0;
     margin: 0;
     border-bottom: 1px solid #ccc;
     opacity: 0.6;
@@ -887,16 +887,13 @@
     border-top: none;
     padding-top: 0;
   }
-  figure, pre {
+  figure, pre, .vcard {
     page-break-inside: avoid;
   }
-  figure {
-    overflow: scroll;
-  }
   h1, h2, h3, h4, h5, h6 {
     page-break-after: avoid;
   }
-  h2+*, h3+*, h4+*, h5+*, h6+* {
+  :is(h2, h3, h4, h5, h6)+*, dd {
     page-break-before: avoid;
   }
   pre {
@@ -910,6 +907,9 @@
   td {
     border-top: 1px solid #ddd;
   }
+  .toplink {
+    display: none;
+  }
 }
 
 @page :first {
@@ -1010,28 +1010,6 @@
   text-align: right;
 }
 
-/* Give the table caption label the same styling as the figcaption */
-
-@media print {
-  .toplink {
-    display: none;
-  }
-
-  /* avoid overwriting the top border line with the ToC header */
-  #toc {
-    padding-top: 1px;
-  }
-
-  /* Avoid page breaks inside dl and author address entries */
-  dd {
-    page-break-before: avoid;
-  }
-  .vcard {
-    page-break-inside: avoid;
-  }
-
-}
-
 /* Dark mode. */
 @media (prefers-color-scheme: dark) {
 :root {
@@ -1072,7 +1050,7 @@
 </tr></thead>
 <tfoot><tr>
 <td class="left">Beurdouche, et al.</td>
-<td class="center">Expires 14 March 2024</td>
+<td class="center">Expires 31 March 2024</td>
 <td class="right">[Page]</td>
 </tr></tfoot>
 </table>
@@ -1085,12 +1063,12 @@
 <dd class="internet-draft">draft-ietf-mls-architecture-latest</dd>
 <dt class="label-published">Published:</dt>
 <dd class="published">
-<time datetime="2023-09-11" class="published">11 September 2023</time>
+<time datetime="2023-09-28" class="published">28 September 2023</time>
     </dd>
 <dt class="label-intended-status">Intended Status:</dt>
 <dd class="intended-status">Informational</dd>
 <dt class="label-expires">Expires:</dt>
-<dd class="expires"><time datetime="2024-03-14">14 March 2024</time></dd>
+<dd class="expires"><time datetime="2024-03-31">31 March 2024</time></dd>
 <dt class="label-authors">Authors:</dt>
 <dd class="authors">
 <div class="author">
@@ -1167,7 +1145,7 @@ <h2 id="name-status-of-this-memo">
         time. It is inappropriate to use Internet-Drafts as reference
         material or to cite them other than as "work in progress."<a href="#section-boilerplate.1-3" class="pilcrow">¶</a></p>
 <p id="section-boilerplate.1-4">
-        This Internet-Draft will expire on 14 March 2024.<a href="#section-boilerplate.1-4" class="pilcrow">¶</a></p>
+        This Internet-Draft will expire on 31 March 2024.<a href="#section-boilerplate.1-4" class="pilcrow">¶</a></p>
 </section>
 </div>
 <div id="copyright">
@@ -1212,7 +1190,7 @@ <h2 id="name-copyright-notice">
                 <p id="section-toc.1-1.3.2.2.1"><a href="#section-3.2" class="auto internal xref">3.2</a>.  <a href="#name-step-2-initial-keying-mater" class="internal xref">Step 2: Initial Keying Material</a></p>
 </li>
               <li class="compact toc ulBare ulEmpty" id="section-toc.1-1.3.2.3">
-                <p id="section-toc.1-1.3.2.3.1"><a href="#section-3.3" class="auto internal xref">3.3</a>.  <a href="#name-step-3-adding-bob-go-the-gr" class="internal xref">Step 3: Adding Bob go the Group</a></p>
+                <p id="section-toc.1-1.3.2.3.1"><a href="#section-3.3" class="auto internal xref">3.3</a>.  <a href="#name-step-3-adding-bob-to-the-gr" class="internal xref">Step 3: Adding Bob to the Group</a></p>
 </li>
               <li class="compact toc ulBare ulEmpty" id="section-toc.1-1.3.2.4">
                 <p id="section-toc.1-1.3.2.4.1"><a href="#section-3.4" class="auto internal xref">3.4</a>.  <a href="#name-step-4-adding-charlie-to-th" class="internal xref">Step 4: Adding Charlie to the Group</a></p>
@@ -1725,12 +1703,12 @@ <h3 id="name-step-2-initial-keying-mater">
 sender can use a new key.<a href="#section-3.2-1" class="pilcrow">¶</a></p>
 </section>
 </div>
-<div id="step-3-adding-bob-go-the-group">
+<div id="step-3-adding-bob-to-the-group">
 <section id="section-3.3">
-        <h3 id="name-step-3-adding-bob-go-the-gr">
-<a href="#section-3.3" class="section-number selfRef">3.3. </a><a href="#name-step-3-adding-bob-go-the-gr" class="section-name selfRef">Step 3: Adding Bob go the Group</a>
+        <h3 id="name-step-3-adding-bob-to-the-gr">
+<a href="#section-3.3" class="section-number selfRef">3.3. </a><a href="#name-step-3-adding-bob-to-the-gr" class="section-name selfRef">Step 3: Adding Bob to the Group</a>
         </h3>
-<p id="section-3.3-1">When Alice wants to create a group including Bob, she first uses the AS to look
+<p id="section-3.3-1">When Alice wants to create a group including Bob, she first uses the DS to look
 up his initial keying material. She then generates two messages:<a href="#section-3.3-1" class="pilcrow">¶</a></p>
 <ul class="normal">
 <li class="normal" id="section-3.3-2.1">A message to the entire group (which at this point is just her and Bob)
@@ -1753,7 +1731,7 @@ <h3 id="name-step-4-adding-charlie-to-th">
 <a href="#section-3.4" class="section-number selfRef">3.4. </a><a href="#name-step-4-adding-charlie-to-th" class="section-name selfRef">Step 4: Adding Charlie to the Group</a>
         </h3>
 <p id="section-3.4-1">If Alice then wants to add Charlie to the group, she follows a similar procedure
-as with Bob: she first uses the AS to look
+as with Bob: she first uses the DS to look
 up his initial keying material and then generates two messages:<a href="#section-3.4-1" class="pilcrow">¶</a></p>
 <ul class="normal">
 <li class="normal" id="section-3.4-2.1">A message to the entire group (consisting of her, Bob, and Charlie) adding
@@ -3458,6 +3436,7 @@ <h2 id="name-iana-considerations">
       <h2 id="name-references">
 <a href="#section-10" class="section-number selfRef">10. </a><a href="#name-references" class="section-name selfRef">References</a>
       </h2>
+<div id="sec-normative-references">
 <section id="section-10.1">
         <h3 id="name-normative-references">
 <a href="#section-10.1" class="section-number selfRef">10.1. </a><a href="#name-normative-references" class="section-name selfRef">Normative References</a>
@@ -3469,6 +3448,8 @@ <h3 id="name-normative-references">
 <dd class="break"></dd>
 </dl>
 </section>
+</div>
+<div id="sec-informative-references">
 <section id="section-10.2">
         <h3 id="name-informative-references">
 <a href="#section-10.2" class="section-number selfRef">10.2. </a><a href="#name-informative-references" class="section-name selfRef">Informative References</a>
@@ -3560,6 +3541,7 @@ <h3 id="name-informative-references">
 <dd class="break"></dd>
 </dl>
 </section>
+</div>
 </section>
 <div id="contributors">
 <section id="appendix-A">
diff --git a/draft-ietf-mls-architecture.txt b/draft-ietf-mls-architecture.txt
index 04ea5a7..ada8c49 100644
--- a/draft-ietf-mls-architecture.txt
+++ b/draft-ietf-mls-architecture.txt
@@ -5,14 +5,14 @@
 Network Working Group                                      B. Beurdouche
 Internet-Draft                                           Inria & Mozilla
 Intended status: Informational                               E. Rescorla
-Expires: 14 March 2024                                           Mozilla
+Expires: 31 March 2024                                           Mozilla
                                                                 E. Omara
                                                                   Google
                                                                S. Inguva
                                                                         
                                                                 A. Duric
                                                                     Wire
-                                                       11 September 2023
+                                                       28 September 2023
 
 
             The Messaging Layer Security (MLS) Architecture
@@ -68,7 +68,7 @@ Status of This Memo
    time.  It is inappropriate to use Internet-Drafts as reference
    material or to cite them other than as "work in progress."
 
-   This Internet-Draft will expire on 14 March 2024.
+   This Internet-Draft will expire on 31 March 2024.
 
 Copyright Notice
 
@@ -91,7 +91,7 @@ Table of Contents
    3.  Overview of Operation
      3.1.  Step 1: Account Creation
      3.2.  Step 2: Initial Keying Material
-     3.3.  Step 3: Adding Bob go the Group
+     3.3.  Step 3: Adding Bob to the Group
      3.4.  Step 4: Adding Charlie to the Group
      3.5.  Other Group Operations
      3.6.  Users, Clients, and Groups
@@ -310,10 +310,10 @@ Welcome (Charlie) ----------------------------------------->     | Step 4
    secrecy it is better for this material to be regularly refreshed so
    that each sender can use a new key.
 
-3.3.  Step 3: Adding Bob go the Group
+3.3.  Step 3: Adding Bob to the Group
 
    When Alice wants to create a group including Bob, she first uses the
-   AS to look up his initial keying material.  She then generates two
+   DS to look up his initial keying material.  She then generates two
    messages:
 
    *  A message to the entire group (which at this point is just her and
@@ -332,7 +332,7 @@ Welcome (Charlie) ----------------------------------------->     | Step 4
 3.4.  Step 4: Adding Charlie to the Group
 
    If Alice then wants to add Charlie to the group, she follows a
-   similar procedure as with Bob: she first uses the AS to look up his
+   similar procedure as with Bob: she first uses the DS to look up his
    initial keying material and then generates two messages:
 
    *  A message to the entire group (consisting of her, Bob, and