diff --git a/index.html b/index.html
index 044b2124..6a635bd4 100644
--- a/index.html
+++ b/index.html
@@ -1043,7 +1043,7 @@ <h2>
           </li>
           <li data-tests="rejects_if_not_active.https.html">If |document| is
           not [=Document/fully active=], then return <a>a promise rejected
-          with</a> an {{"AbortError"}} {{DOMException}}.
+          with</a> an {{"InvalidStateError"}} {{DOMException}}.
           </li>
           <li>If |document|'s [=Document/visibility state=] is not `"visible"`,
           then return <a>a promise rejected with</a> an {{"AbortError"}}
@@ -1331,9 +1331,17 @@ <h2>
             <ol>
               <li>Close down the user interface.
               </li>
+              <li>Set |request|.{{PaymentRequest/[[state]]}} to
+              "[=PaymentRequest/closed=]".
+              </li>
               <li>Set |request|'s <a>payment-relevant browsing context</a>'s
               <a>payment request is showing</a> boolean to false.
               </li>
+              <li>
+                <a>Queue a task</a> on the <a>user interaction task source</a>
+                to [=reject=] |acceptPromise| with an {{"AbortError"}}
+                {{DOMException}}.
+              </li>
             </ol>
           </li>
         </ol>
@@ -2488,7 +2496,7 @@ <h2>
           <li data-tests=
           "payment-response/rejects_if_not_active-manual.https.html">If
           |document| is not [=Document/fully active=], then return <a>a promise
-          rejected with</a> an {{"AbortError"}} {{DOMException}}.
+          rejected with</a> an {{"InvalidStateError"}} {{DOMException}}.
           </li>
           <li>If |response|.{{PaymentResponse/[[complete]]}} is true, return
           <a>a promise rejected with</a> an {{"InvalidStateError"}}
@@ -2589,9 +2597,17 @@ <h2>
             <ol>
               <li>Close down the user interface.
               </li>
+              <li>Set |request|.{{PaymentRequest/[[state]]}} to
+              "[=PaymentRequest/closed=]".
+              </li>
               <li>Set |request|'s <a>payment-relevant browsing context</a>'s
               <a>payment request is showing</a> boolean to false.
               </li>
+              <li>
+                <a>Queue a task</a> on the <a>user interaction task source</a>
+                to [=reject=] |retryPromise| with an {{"AbortError"}}
+                {{DOMException}}.
+              </li>
             </ol>
           </li>
           <li>Finally, when |retryPromise| settles, set
@@ -2920,6 +2936,11 @@ <h2>
               <li>Set |request|'s <a>payment-relevant browsing context</a>'s
               <a>payment request is showing</a> boolean to false.
               </li>
+              <li>
+                <a>Queue a task</a> on the <a>user interaction task source</a>
+                to [=reject=] |promise| with an {{"AbortError"}}
+                {{DOMException}}.
+              </li>
             </ol>
           </li>
           <li>Otherwise:
@@ -3504,6 +3525,13 @@ <h2>
           "[=PaymentRequest/created=]", then return <a>a promise rejected
           with</a> an {{"InvalidStateError"}} {{DOMException}}.
           </li>
+          <li>Let |document| be |request|'s [=relevant global object=]'s
+          [=associated `Document`=].
+          </li>
+          <li>If |document| is not [=Document/fully active=], then return
+          <a>a promise rejected with</a> an {{"InvalidStateError"}}
+          {{DOMException}}.
+          </li>
           <li data-tests="">Optionally, at the <a>top-level browsing
           context</a>'s discretion, return <a>a promise rejected with</a> a
           {{"NotAllowedError"}} {{DOMException}}.
@@ -4430,11 +4458,11 @@ <h2 id="user-info">
           data models used by existing payment methods, prescribing data
           specifics in this API would limit its usefulness. The
           {{PaymentResponse/details}} member carries data from the payment
-          handler, whether Web-based (as defined by the [[[web-based-payment-handler]]])
-          or proprietary. The [=user agent=] MUST NOT support payment handlers
-          unless they include adequate user consent mechanisms (such as
-          awareness of parties to the transaction and mechanisms for
-          demonstrating the intention to share data).
+          handler, whether Web-based (as defined by the
+          [[[web-based-payment-handler]]]) or proprietary. The [=user agent=]
+          MUST NOT support payment handlers unless they include adequate user
+          consent mechanisms (such as awareness of parties to the transaction
+          and mechanisms for demonstrating the intention to share data).
         </p>
         <p>
           The <a>user agent</a> MUST NOT share the values of the