diff --git a/index.bs b/index.bs
index c3c61084..ab81c07c 100644
--- a/index.bs
+++ b/index.bs
@@ -5065,7 +5065,7 @@ over just using {{SyntaxError!!exception}} to refer to the {{DOMException}}. [[D
     <tbody>
         <tr class="deprecated">
             <td>"<dfn id="indexsizeerror" exception export><code>IndexSizeError</code></dfn>"</td>
-            <td><strong>Deprecated.</strong> Use {{RangeError}} instead.</td></td>
+            <td><strong>Deprecated.</strong> Use {{RangeError}} instead.</td>
             <td><dfn id="dom-domexception-index_size_err" for="DOMException" const export><code>INDEX_SIZE_ERR</code></dfn>&nbsp;(1)</td>
         </tr>
         <tr>
@@ -5075,7 +5075,7 @@ over just using {{SyntaxError!!exception}} to refer to the {{DOMException}}. [[D
         </tr>
         <tr>
             <td>"<dfn id="wrongdocumenterror" exception export><code>WrongDocumentError</code></dfn>"</td>
-            <td>The object is in the wrong [=document=]. [[DOM]]</td>
+            <td>The object is in the wrong [=/document=]. [[DOM]]</td>
             <td><dfn id="dom-domexception-wrong_document_err" for="DOMException" const export><code>WRONG_DOCUMENT_ERR</code></dfn>&nbsp;(4)</td>
         </tr>
         <tr>
@@ -7649,7 +7649,7 @@ value when its bit pattern is interpreted as an [=/64-bit unsigned integer=].
 </div>
 
 <p id="DOMString-to-js">
-    <span id="DOMString-to-es"></script>
+    <span id="DOMString-to-es"></span>
     The result of [=converted to a JavaScript value|converting=]
     an IDL {{DOMString}} value to a JavaScript
     value is the String
@@ -7675,7 +7675,7 @@ value when its bit pattern is interpreted as an [=/64-bit unsigned integer=].
 </div>
 
 <p id="ByteString-to-js">
-    <span id="ByteString-to-es"></script>
+    <span id="ByteString-to-es"></span>
     The result of [=converted to a JavaScript value|converting=]
     an IDL {{ByteString}} value to a JavaScript
     value is a String
@@ -8249,7 +8249,7 @@ IDL [=promise type=] values are represented by JavaScript [=PromiseCapability=]
     <code><a interface>Promise</a>&lt;<var ignore>T</var>&gt;</code> in a [=realm=] |realm|,
     perform the following steps:
 
-    1.  Let |constructor| be |realm|.\[[Intrinsics]].[[{{%Promise%}}]].
+    1.  Let |constructor| be |realm|.\[[Intrinsics]].\[[{{%Promise%}}]].
     1.  Return [=?=] [$NewPromiseCapability$](|constructor|).
 </div>
 
@@ -8261,7 +8261,7 @@ IDL [=promise type=] values are represented by JavaScript [=PromiseCapability=]
 
     1.  Let |value| be the result of [=converted to a JavaScript value|converting=] |x| to a
         JavaScript value.
-    1.  Let |constructor| be |realm|.\[[Intrinsics]].[[{{%Promise%}}]].
+    1.  Let |constructor| be |realm|.\[[Intrinsics]].\[[{{%Promise%}}]].
     1.  Let |promiseCapability| be [=?=] [$NewPromiseCapability$](|constructor|).
     1.  Perform [=!=] [$Call$](|promiseCapability|.\[[Resolve]], <emu-val>undefined</emu-val>,
         « |value| »).
@@ -8274,7 +8274,7 @@ IDL [=promise type=] values are represented by JavaScript [=PromiseCapability=]
     <code><a interface>Promise</a>&lt;<var ignore>T</var>&gt;</code>, with reason |r| (a
     JavaScript value) in a [=realm=] |realm|, perform the following steps:
 
-    1.  Let |constructor| be |realm|.\[[Intrinsics]].[[{{%Promise%}}]].
+    1.  Let |constructor| be |realm|.\[[Intrinsics]].\[[{{%Promise%}}]].
     1.  Let |promiseCapability| be [=?=] [$NewPromiseCapability$](|constructor|).
     1.  Perform [=!=] [$Call$](|promiseCapability|.\[[Reject]], <emu-val>undefined</emu-val>,
         « |r| »).
@@ -8325,7 +8325,7 @@ IDL [=promise type=] values are represented by JavaScript [=PromiseCapability=]
             [=a promise rejected with=] |reason|.
         1.  Return |result|, [=converted to a JavaScript value=].
     1.  Let |onRejected| be [$CreateBuiltinFunction$](|onRejectedSteps|, « »):
-    1.  Let |constructor| be |promise|.\[[Promise]].\[[Realm]].\[[Intrinsics]].[[{{%Promise%}}]].
+    1.  Let |constructor| be |promise|.\[[Promise]].\[[Realm]].\[[Intrinsics]].\[[{{%Promise%}}]].
     1.  Let |newCapability| be [=?=] [$NewPromiseCapability$](|constructor|).
 
         Note: Not all callers will use the returned {{Promise}}. Implementations might wish to
@@ -8900,7 +8900,7 @@ a reference to the same object that the IDL value represents.
     |bytes| in a [=realm=] |realm|:
 
     1.  Let |jsArrayBuffer| be [=?=]
-        [$AllocateArrayBuffer$](|realm|.\[[Intrinsics]].[[{{%ArrayBuffer%}}]], |bytes|'s
+        [$AllocateArrayBuffer$](|realm|.\[[Intrinsics]].\[[{{%ArrayBuffer%}}]], |bytes|'s
         [=byte sequence/length=]).
     1.  Let |arrayBuffer| be the result of [=converted to an IDL value|converting=] |jsArrayBuffer|
         to an IDL value of type {{ArrayBuffer}}.
@@ -8913,7 +8913,7 @@ a reference to the same object that the IDL value represents.
     [=byte sequence=] |bytes| in a [=realm=] |realm|:
 
     1.  Let |jsSharedArrayBuffer| be [=?=]
-        [$AllocateSharedArrayBuffer$](|realm|.\[[Intrinsics]].[[{{%SharedArrayBuffer%}}]], |bytes|'s
+        [$AllocateSharedArrayBuffer$](|realm|.\[[Intrinsics]].\[[{{%SharedArrayBuffer%}}]], |bytes|'s
         [=byte sequence/length=]).
     1.  Let |sharedArrayBuffer| be the result of [=converted to an IDL value|converting=]
         |jsSharedArrayBuffer| to an IDL value of type {{SharedArrayBuffer}}.
@@ -9089,7 +9089,7 @@ a reference to the same object that the IDL value represents.
     1.  Perform [=?=] [$DetachArrayBuffer$](|jsArrayBuffer|).
     1.  If |targetRealm| is not given, let |targetRealm| be the [=current realm=].
     1.  Let |jsTransferred| be [=?=]
-        [$AllocateArrayBuffer$](|targetRealm|.\[[Intrinsics]].[[{{%ArrayBuffer%}}]], 0).
+        [$AllocateArrayBuffer$](|targetRealm|.\[[Intrinsics]].\[[{{%ArrayBuffer%}}]], 0).
     1.  Set |jsTransferred|.\[[ArrayBufferData]] to |arrayBufferData|.
     1.  Set |jsTransferred|.\[[ArrayBufferByteLength]] to |arrayBufferByteLength|.
     1.  Return the result of [=converted to an IDL value|converting=] |jsTransferred| to an IDL
@@ -11561,7 +11561,7 @@ default interfaces do not have such steps.
         1.  Assert: |O| is an object that [=implements=] |I|.
         1.  Assert: |O|.\[[Realm]] is |realm|.
         1.  Return |O|.
-    1.  Let |constructorProto| be |realm|.\[[Intrinsics]].[[{{%Function.prototype%}}]].
+    1.  Let |constructorProto| be |realm|.\[[Intrinsics]].\[[{{%Function.prototype%}}]].
     1.  If |I| inherits from some other interface |P|,
         then set |constructorProto| to the [=interface object=] of |P| in |realm|.
     1.  Let |F| be <a abstract-op>CreateBuiltinFunction</a>(|steps|, « \[[Unforgeables]] »,
@@ -11662,8 +11662,8 @@ with the [{{LegacyNoInterfaceObject}}] [=extended attribute=].
         then set |proto| to the [=interface prototype object=] in |realm|
         of that [=inherited interface=].
     1.  Otherwise, if |interface| is the {{DOMException}} [=interface=],
-        then set |proto| to |realm|.\[[Intrinsics]].[[{{%Error.prototype%}}]].
-    1.  Otherwise, set |proto| to |realm|.\[[Intrinsics]].[[{{%Object.prototype%}}]].
+        then set |proto| to |realm|.\[[Intrinsics]].\[[{{%Error.prototype%}}]].
+    1.  Otherwise, set |proto| to |realm|.\[[Intrinsics]].\[[{{%Object.prototype%}}]].
     1.  Assert: |proto| [=is an Object=].
     1.  Let |interfaceProtoObj| be null.
     1.  If |realm|'s [=is global prototype chain mutable=] is true, then:
@@ -11761,7 +11761,7 @@ for that interface on which named properties are exposed.
     1.  Let |proto| be null.
     1.  If |interface| is declared to inherit from another interface,
         then set |proto| to the [=interface prototype object=] in |realm| for the [=inherited interface=].
-    1.  Otherwise, set |proto| to |realm|.\[[Intrinsics]].[[{{%Object.prototype%}}]].
+    1.  Otherwise, set |proto| to |realm|.\[[Intrinsics]].\[[{{%Object.prototype%}}]].
     1.  Let |obj| be [$MakeBasicObject$](« \[[Prototype]], \[[Extensible]] »).
     1.  Set |obj|.\[[GetOwnProperty]] as specified in [[#named-properties-object-getownproperty]].
     1.  Set |obj|.\[[DefineOwnProperty]] as specified in [[#named-properties-object-defineownproperty]].
@@ -14531,7 +14531,7 @@ The characteristics of a namespace object are described in [[#namespace-object]]
     The namespace object for a given [=namespace=] |namespace| and [=realm=] |realm|
     is <dfn lt="create a namespace object">created</dfn> as follows:
 
-    1.  Let |namespaceObject| be [$OrdinaryObjectCreate$](|realm|.\[[Intrinsics]].[[{{%Object.prototype%}}]]).
+    1.  Let |namespaceObject| be [$OrdinaryObjectCreate$](|realm|.\[[Intrinsics]].\[[{{%Object.prototype%}}]]).
     1.  [=Define the regular attributes=] of |namespace| on |namespaceObject| given |realm|.
     1.  [=Define the regular operations=] of |namespace| on |namespaceObject| given |realm|.
     1.  [=Define the constants=] of |namespace| on |namespaceObject| given |realm|.
@@ -14585,7 +14585,7 @@ A {{DOMException}} is represented by a
 
     1.  Let |args| be « |message| ».
 
-    1.  Let |constructor| be [=current realm=].\[[Intrinsics]].[[%|T|%]].
+    1.  Let |constructor| be [=current realm=].\[[Intrinsics]].\[[%|T|%]].
 
     1. Return [=!=] [$Construct$](|constructor|, |args|).
 </div>
@@ -14917,7 +14917,7 @@ Extensions to any other aspect of the IDL language are
 strongly discouraged.
 
 
-<h2 id="legacy-constructs">Legacy constructs</h4>
+<h2 id="legacy-constructs">Legacy constructs</h2>
 
 <i>This section is informative.</i>
 
@@ -15195,14 +15195,14 @@ defined in this specification — see
 for the syntaxes that are used by these extended attributes.
 
 
-<h2 id="conventions" class="no-num">Document conventions</h3>
+<h2 id="conventions" class="no-num">Document conventions</h2>
 
 The following typographic conventions are used in this document:
 
 *   Defining instances of terms: <dfn id="dfn-example-term">example term</dfn>
 *   Links to terms defined in this document or elsewhere: [=example term=]
 *   Grammar terminals: <emu-t>sometoken</emu-t>
-*   Grammar non-terminals: <emu-nt>ExampleGrammarNonTerminal</emu-t>
+*   Grammar non-terminals: <emu-nt>ExampleGrammarNonTerminal</emu-nt>
 *   Grammar symbols: <emu-t class="regex">identifier</emu-t>
 *   IDL types: {{unsigned long}}
 *   JavaScript classes: {{Map}}