diff --git a/index.html b/index.html
index d08512c1..478e0293 100644
--- a/index.html
+++ b/index.html
@@ -200,23 +200,43 @@ <h5>Use of the DOM by Some Assistive Technologies</h5>
       <h3>HTML Element Role Mappings</h3>
     	<p><strong>Notes:</strong></p>
     	<ul>
-    		<li>HTML elements with default WAI-ARIA role semantics MUST be mapped to platform <a class="termref">accessibility APIs</a> according to those WAI-ARIA roles' mappings as defined in the [[core-aam-1.2]] specification.</li>
-        <li>A '?' in a cell indicates the data has yet to be provided.</li>
-    		<li>"Not mapped" (Not Applicable) means the element does not need to be exposed via an <a class="termref">accessibility API</a>. This is usually because the element is not displayed as part of the user interface.</li>
-        <li>Where applicable, how an element participates in the computation of its own or another element's <a class="termref">accessible name</a> and/or <a class="termref">accessible description</a> is described in the <a href="#accessible-name-and-description-computation">Accessible Name and Description Computation</a> section below.</li>
-        <li>Where an element is indicated as having &quot;No corresponding [WAI-ARIA] role&quot;, user agents MUST NOT expose the <a class="core-mapping" href="#ariaRoleDescription"><code>aria-roledescription</code></a> property value in the <a class="termref">accessibility tree</a> unless the element has an explicit, conforming `role` attribute value.</li>
-        <li><strong>IAccessible2:</strong>
+    		<li>
+          HTML elements with default WAI-ARIA role semantics MUST be mapped to platform <a class="termref">accessibility APIs</a> according to those WAI-ARIA roles' mappings as defined in the [[core-aam-1.2]] specification.
+        </li>
+        <li>
+          A '?' in a cell indicates the data has yet to be provided.
+        </li>
+    		<li>
+          "Not mapped" means the element does not need to be exposed via an <a class="termref">accessibility API</a>. This is usually due to the element not being displayed as part of the user interface.
+        </li>
+        <li>
+          "If mapped" means the element is conditionally exposed in the accessibility tree. User agents MUST map the element if it is interactive or has semantic meaning. User agents MAY also include this element in the accessibility tree for implementation-specific reasons.
+        </li>
+        <li>
+          Where applicable, how an element participates in the computation of its own or another element's <a class="termref">accessible name</a> and/or <a class="termref">accessible description</a> is described in the <a href="#accessible-name-and-description-computation">Accessible Name and Description Computation</a> section below.
+        </li>
+        <li>
+          Where an element is indicated as having &quot;No corresponding [WAI-ARIA] role&quot;, user agents MUST NOT expose the <a class="core-mapping" href="#ariaRoleDescription"><code>aria-roledescription</code></a> property value in the <a class="termref">accessibility tree</a> unless the element has an explicit, conforming `role` attribute value.
+        </li>
+        <li>
+          <strong>IAccessible2:</strong>
           <ul>
             <li>All elements with accessible objects should implement the IAccessible, IAccessible2 and IAccessible2_2 interfaces.</li>
           </ul>
         </li>
-        <li><strong>UIA:</strong>
+        <li>
+          <strong>UIA:</strong>
           <ul>
-            <li>When a <a href="https://www.w3.org/TR/html/sec-forms.html#labelable-element">labelable element</a> is referenced by a `label` element's `for` attribute, or a descendant of a `label` element, the labelable element's UIA `LabeledBy` property points to the UIA element for the `label` element.</li>
-            <li>Elements mapped to the `Text` Control Type are not generally represented as <a class="termref" data-lt="accessible object">accessible objects</a> in the <a class="termref">accessibility tree</a>, but are just part of the `Text` Control Pattern implemented for the whole HTML document. However, if they have any `aria-` attributes or an explicit `tabindex` specified, elements mapped to the `Text` Control Type will be represented as <a class="termref" data-lt="accessible object">accessible objects</a> in the <a class="termref">accessibility tree</a>.</li>
+            <li>
+              When a <a data-cite="html/#category-label">labelable element</a> is referenced by a `label` element's `for` attribute, or a descendant of a `label` element, the labelable element's UIA `LabeledBy` property points to the UIA element for the `label` element.
+            </li>
+            <li>
+              Elements mapped to the `Text` Control Type are not generally represented as <a class="termref" data-lt="accessible object">accessible objects</a> in the <a class="termref">accessibility tree</a>, but are just part of the `Text` Control Pattern implemented for the whole HTML document. However, if they have any `aria-` attributes or an explicit `tabindex` specified, elements mapped to the `Text` Control Type will be represented as <a class="termref" data-lt="accessible object">accessible objects</a> in the <a class="termref">accessibility tree</a>.
+            </li>
           </ul>
         </li>
-    		<li><strong>AXAPI:</strong>
+    		<li>
+          <strong>AXAPI:</strong>
           <ul>
             <li>User agents should return a user-presentable, localized string value for the Mac Accessibility AXRoleDescription.</li>
           </ul>
@@ -283,12 +303,10 @@ <h3>HTML Element Role Mappings</h3>
               </td>
               <td class="atk">
                 <div class="role">
-                  <span class="type">Role:</span>
-                  `ATK_ROLE_STATIC`
+                  <span class="type">Role:</span> `ATK_ROLE_STATIC`
                 </div>
                 <div class="ifaces">
-                  <span class="type">Interfaces:</span>
-                  `AtkText`; `AtkHypertext`
+                  <span class="type">Interfaces:</span> `AtkText`; `AtkHypertext`
                 </div>
               </td>
               <td class="ax">
@@ -351,7 +369,9 @@ <h3>HTML Element Role Mappings</h3>
               <td class="comments"></td>
             </tr>
             <tr tabindex="-1" id="el-address">
-              <th><a data-cite="HTML">`address`</a></th>
+              <th>
+                <a data-cite="HTML">`address`</a>
+              </th>
               <td class="aria">No corresponding role</td>
               <td class="ia2">
                 <div class="role">
@@ -424,7 +444,9 @@ <h3>HTML Element Role Mappings</h3>
                   <span class="type">Role:</span> `ATK_ROLE_STATIC`
                 </div>
               </td>
-              <td class="ax"><div class="general">Not mapped</div></td>
+              <td class="ax">
+                <div class="general">Not mapped</div>
+              </td>
               <td class="comments"></td>
             </tr>
             <tr tabindex="-1" id="el-article">
@@ -468,12 +490,12 @@ <h3>HTML Element Role Mappings</h3>
                 </div>
               </td>
               <td class="uia">
-                    <div class="ctrltype">
-                        <span class="type">Control Type: </span><code>Group</code>
-                    </div>
-                    <div class="ctrltype"><span class="type">Localized Control Type:</span> <code>"audio"</code></div>
-                    <div class="general"><b>Note:</b> If the <a href="https://www.w3.org/TR/html/semantics.html#attr-media-controls"><code>controls</code></a> attribute is present, UI controls (e.g. play, volume) are exposed as children of the <a href="https://www.w3.org/TR/html/semantics-embedded-content.html#the-audio-element"><code>audio</code></a> element in the <a class="termref">accessibility tree</a>, and mapped as appropriate for the type of control (e.g. <a class="core-mapping" href="#role-map-button"><code>button</code></a> or <a class="core-mapping" href="#role-map-slider"><code>slider</code></a>).</div>
-                    <div class="general">Text objects associated with loading or error messages, and any UI control not currently displayed, MAY be present in the <a class="termref">accessibility tree</a> and marked as hidden or off-screen.</div>
+                <div class="ctrltype">
+                    <span class="type">Control Type: </span><code>Group</code>
+                </div>
+                <div class="ctrltype"><span class="type">Localized Control Type:</span> <code>"audio"</code></div>
+                <div class="general"><b>Note:</b> If the <a href="https://www.w3.org/TR/html/semantics.html#attr-media-controls"><code>controls</code></a> attribute is present, UI controls (e.g. play, volume) are exposed as children of the <a href="https://www.w3.org/TR/html/semantics-embedded-content.html#the-audio-element"><code>audio</code></a> element in the <a class="termref">accessibility tree</a>, and mapped as appropriate for the type of control (e.g. <a class="core-mapping" href="#role-map-button"><code>button</code></a> or <a class="core-mapping" href="#role-map-slider"><code>slider</code></a>).</div>
+                <div class="general">Text objects associated with loading or error messages, and any UI control not currently displayed, MAY be present in the <a class="termref">accessibility tree</a> and marked as hidden or off-screen.</div>
               </td>
               <td class="atk">
                 <div class="role">
@@ -502,21 +524,33 @@ <h3>HTML Element Role Mappings</h3>
               </th>
               <td class="aria">No corresponding role</td>
               <td class="ia2">
+                <!-- TODO add if mapped -->
                 <div class="general">
                   No accessible object. Exposed as "font-weight" text attribute on the text container. The value depends on the platform.
                 </div>
               </td>
               <td class="uia">
+                <!-- TODO add if mapped -->
                 <div class="general">
                   No accessible object. Exposed by the `FontWeight` attribute of the `TextRange` Control Pattern implemented on a parent accessible object.
                 </div>
               </td>
               <td class="atk">
                 <div class="general">
-                  No accessible object. Exposed as "font-weight" text attribute on the text container. The value depends on the platform.
+                  If mapped:
+                </div>
+                <div class="role">
+                  <span class="type">Role:</span> `ATK_ROLE_STATIC`
+                </div>
+                <div class="general">
+                  Otherwise no accessible object.
+                  Exposed as "font-weight" text attribute on the text container. The value depends on the platform.
                 </div>
               </td>
               <td class="ax">
+                <div class="general">
+                  If mapped:
+                </div>
                 <div class="role">
                   <span class="type">AXRole:</span> `AXGroup`
                 </div>
@@ -546,6 +580,7 @@ <h3>HTML Element Role Mappings</h3>
               </th>
               <td class="aria">No corresponding role</td>
               <td class="ia2">
+                <!-- TODO add if mapped -->
                 <div class="general">
                   No accessible object. May affect on "writing-mode" text attribute on its text container.
                 </div>
@@ -557,10 +592,30 @@ <h3>HTML Element Role Mappings</h3>
               </td>
               <td class="atk">
                 <div class="general">
-                  No accessible object. May affect on "writing-mode" text attribute on its text container.
+                  If mapped:
+                </div>
+                <div class="role">
+                  <span class="type">Role:</span> `ATK_ROLE_STATIC`
+                </div>
+                <div class="general">
+                  Otherwise no accessible object.
+                  May affect on "writing-mode" text attribute on its text container.
+                </div>
+              </td>
+              <td class="ax">
+                <div class="general">
+                  If mapped:
+                </div>
+                <div class="role">
+                  <span class="type">AXRole:</span> `AXGroup`
+                </div>
+                <div class="subrole">
+                  <span class="type">AXSubrole:</span> `(nil)`
+                </div>
+                <div class="roledesc">
+                  <span class="type">AXRoleDescription:</span> `"group"`
                 </div>
               </td>
-              <td class="ax"></td>
               <td class="comments"></td>
             </tr>
             <tr tabindex="-1" id="el-bdo">
@@ -583,10 +638,20 @@ <h3>HTML Element Role Mappings</h3>
               </td>
               <td class="atk">
                 <div class="general">
-                  No accessible object. Exposed as "writing-mode" text attribute on its text container.
+                  If mapped:
+                </div>
+                <div class="role">
+                  <span class="type">Role:</span> `ATK_ROLE_STATIC`
+                </div>
+                <div class="general">
+                  Otherwise no accessible object.
+                  Exposed as "writing-mode" text attribute on its text container.
                 </div>
               </td>
               <td class="ax">
+                <div class="general">
+                  If mapped:
+                </div>
                 <div class="role">
                   <span class="type">AXRole:</span> `AXGroup`
                 </div>
@@ -614,10 +679,12 @@ <h3>HTML Element Role Mappings</h3>
                   </div>
                 </td>
                 <td class="uia">
-                    <div class="ctrltype">
-                        <span class="type">Control Type: </span><code>Group</code>
-                    </div>
-                    <div class="ctrltype"><span class="type">Localized Control Type:</span> <code>"blockquote"</code></div>
+                  <div class="ctrltype">
+                    <span class="type">Control Type: </span><code>Group</code>
+                  </div>
+                  <div class="ctrltype">
+                    <span class="type">Localized Control Type:</span> <code>"blockquote"</code>
+                  </div>
                 </td>
                 <td class="atk">
                   <div class="role">
@@ -630,15 +697,15 @@ <h3>HTML Element Role Mappings</h3>
                   </div>
                 </td>
                 <td class="ax">
-                    <div class="role">
-                        <span class="type">AXRole: </span><code>AXGroup</code>
-                    </div>
-                    <div class="subrole">
-                        <span class="type">AXSubrole: </span><code>(nil)</code>
-                    </div>
-                    <div class="roledesc">
-                        <span class="type">AXRoleDescription: </span><code>"group"</code>
-                    </div>
+                  <div class="role">
+                    <span class="type">AXRole:</span> `AXGroup`
+                  </div>
+                  <div class="subrole">
+                    <span class="type">AXSubrole:</span> `(nil)`
+                  </div>
+                  <div class="roledesc">
+                    <span class="type">AXRoleDescription:</span> `"group"`
+                  </div>
                 </td>
                 <td class="comments"></td>
             </tr>
@@ -719,12 +786,12 @@ <h3>HTML Element Role Mappings</h3>
                   </div>
                 </td>
                 <td class="uia">
-                    <div class="ctrltype">
-                        <span class="type">Control Type: </span><code>Image</code>
-                    </div>
-                    <div class="general">
-                        Descendants of the <code>canvas</code> element are mapped separately.
-                    </div>
+                  <div class="ctrltype">
+                    <span class="type">Control Type: </span><code>Image</code>
+                  </div>
+                  <div class="general">
+                    Descendants of the <code>canvas</code> element are mapped separately.
+                  </div>
                 </td>
                 <td class="atk">
                   <div class="role">
@@ -804,18 +871,26 @@ <h3>HTML Element Role Mappings</h3>
               </th>
               <td class="aria">No corresponding role</td>
               <td class="ia2">
+                <!-- TODO add if mapped -->
                 <div class="general">
                   No accessible object. Styles used are mapped into text attributes on its text container.
                 </div>
               </td>
               <td class="uia">
+                <!-- TODO add if mapped -->
                 <div class="general">
                   No accessible object. Styles used are exposed by UIA text attributes of the `TextRange` Control Pattern implemented on a parent accessible object.
                 </div>
               </td>
               <td class="atk">
                 <div class="general">
-                  No accessible object. Styles used are mapped into text attributes on its text container.
+                  If mapped:
+                </div>
+                <div class="role">
+                  <span class="type">Role:</span> `ATK_ROLE_STATIC`
+                </div>
+                <div class="general">
+                  Otherwise no accessible object. Styles used are mapped into text attributes on its text container.
                 </div>
               </td>
               <td class="ax">
@@ -837,18 +912,27 @@ <h3>HTML Element Role Mappings</h3>
               </th>
               <td class="aria">No corresponding role</td>
               <td class="ia2">
+                <!-- TODO add if mapped -->
                 <div class="general">
                   No accessible object. Styles used are mapped into text attributes on its text container.
                 </div>
               </td>
               <td class="uia">
+                <!-- TODO add if mapped -->
                 <div class="general">
                   No accessible object. Styles used are exposed by UIA text attributes of the `TextRange` Control Pattern implemented on a parent accessible object.
                 </div>
               </td>
               <td class="atk">
                 <div class="general">
-                  No accessible object. Styles used are mapped into text attributes on its text container.
+                  If mapped:
+                </div>
+                <div class="role">
+                  <span class="type">Role:</span> `ATK_ROLE_STATIC`
+                </div>
+                <div class="general">
+                  Otherwise no accessible object.
+                  Styles used are mapped into text attributes on its text container.
                 </div>
               </td>
               <td class="ax">
@@ -933,8 +1017,31 @@ <h3>HTML Element Role Mappings</h3>
               <td class="aria"></td>
               <td class="ia2"><div class="general">Not mapped</div></td>
               <td class="uia"><div class="general">Not mapped</div></td>
-              <td class="atk"><div class="general">Not mapped</div></td>
-              <td class="ax"><div class="general">Not mapped</div></td>
+              <td class="atk">
+                <div class="general">
+                  If mapped:
+                </div>
+                <div class="role">
+                  <span class="type">Role:</span> `ATK_ROLE_STATIC`
+                </div>
+              </td>
+              <td class="ax">
+                <div class="general">
+                  If mapped:
+                </div>
+                <div class="role">
+                  <span class="type">AXRole:</span> `AXGroup`
+                </div>
+                <div class="subrole">
+                  <span class="type">AXSubrole:</span> `(nil)`
+                </div>
+                <div class="roledesc">
+                  <span class="type">AXRoleDescription:</span> `"group"`
+                </div>
+                <div class="general">
+                  Otherwise no accessible object.
+                </div>
+              </td>
               <td class="comments"></td>
             </tr>
             <tr tabindex="-1" id="el-datalist">
@@ -1075,40 +1182,41 @@ <h3>HTML Element Role Mappings</h3>
               </td>
               <td class="ia2">
                 <div class="general">
-                  May not have an accessible object if has no semantic meaning. Otherwise,
+                  If mapped:
                 </div>
                 <div class="role">
-                  <span class="type">Roles:</span> <code>ROLE_SYSTEM_GROUPING</code>; <code>IA2_ROLE_SECTION</code>
+                  <span class="type">Roles:</span> `ROLE_SYSTEM_GROUPING`; `IA2_ROLE_SECTION`
                 </div>
                 <div class="ifaces">
                   <span class="type">Interfaces: </span>
-                  <code>IAccessibleText2</code>; <code>IAccessibleHypertext2</code>;
+                  `IAccessibleText2`; `IAccessibleHypertext2`;
                 </div>
               </td>
               <td class="uia">
-                <div class="ctrltype"><span class="type">Control Type:</span> <code>Group</code></div>
+                <div class="ctrltype">
+                  <span class="type">Control Type:</span> `Group`
+                </div>
               </td>
               <td class="atk">
                 <div class="general">
-                  May not have an accessible object if has no semantic meaning. Otherwise,
+                  If mapped:
                 </div>
                 <div class="role">
-                  <span class="type">Role: </span>
-                  <code>ATK_ROLE_SECTION</code>
+                  <span class="type">Role:</span> `ATK_ROLE_SECTION`
                 </div>
                  <div class="ifaces">
-                  <span class="type">Interfaces:</span> <code>AtkText</code>; <code>AtkHypertext</code>
+                  <span class="type">Interfaces:</span> `AtkText`; `AtkHypertext`
                 </div>
               </td>
               <td class="ax">
                 <div class="role">
-                  <span class="type">AXRole:</span> <code>AXGroup</code>
+                  <span class="type">AXRole:</span> `AXGroup`
                 </div>
                 <div class="subrole">
-                  <span class="type">AXSubrole:</span> <code>(nil)</code>
+                  <span class="type">AXSubrole:</span> `(nil)`
                 </div>
                 <div class="roledesc">
-                  <span class="type">AXRoleDescription:</span> <code>"group"</code>
+                  <span class="type">AXRoleDescription:</span> `"group"`
                 </div>
               </td>
               <td class="comments"></td>
@@ -1168,18 +1276,27 @@ <h3>HTML Element Role Mappings</h3>
               </th>
               <td class="aria">No corresponding role</td>
               <td class="ia2">
+                <!-- TODO add if mapped -->
                 <div class="general">
                   No accessible object. Styles used are mapped into text attributes on its text container.
                 </div>
               </td>
               <td class="uia">
+                <!-- TODO add if mapped -->
                 <div class="general">
                   No accessible object. Styles used are exposed by UIA text attributes of the `TextRange` Control Pattern implemented on a parent accessible object.
                 </div>
               </td>
               <td class="atk">
                 <div class="general">
-                  No accessible object. Styles used are mapped into text attributes on its text container.
+                  If mapped:
+                </div>
+                <div class="role">
+                  <span class="type">Role:</span> `ATK_ROLE_STATIC`
+                </div>
+                <div class="general">
+                  Otherwise no accessible object.
+                  Styles used are mapped into text attributes on its text container.
                 </div>
               </td>
               <td class="ax">
@@ -1433,7 +1550,7 @@ <h3>HTML Element Role Mappings</h3>
               <td class="ax"><div class="general">Use WAI-ARIA mapping</div></td>
               <td class="comments"></td>
             </tr>
-            <tr id="el-header2" tabindex="-1">
+            <tr tabindex="-1" id="el-form-noname">
               <th>
                 <a data-cite="HTML">`form`</a> without an <a class="termref">accessible name</a>
               </th>
@@ -1575,21 +1692,32 @@ <h3>HTML Element Role Mappings</h3>
               </th>
               <td class="aria">No corresponding role</td>
               <td class="ia2">
+                <!-- TODO add if mapped -->
                 <div class="general">No accessible object.</div>
                 <div class="properties">
                   <span class="type">Text attributes: </span><code>font-style:italic</code> on the text container
                 </div>
               </td>
               <td class="uia">
+                <!-- TODO add if mapped -->
                 <div class="general">No accessible object. Exposed by the <code>IsItalic</code> attribute of the <code>TextRange</code> Control Pattern implemented on a parent accessible object.
                 </div>
               </td>
               <td class="atk">
                 <div class="general">
-                  No accessible object. Exposed as "font-style:italic" text attribute on its text container.
+                  If mapped:
+                </div>
+                <div class="role">
+                  <span class="type">Role:</span> `ATK_ROLE_STATIC`
+                </div>
+                <div class="general">
+                  Otherwise no accessible object. Exposed as "font-style:italic" text attribute on its text container.
                 </div>
               </td>
               <td class="ax">
+                <div class="general">
+                  If mapped:
+                </div>
                 <div class="role">
                   <span class="type">AXRole: </span><code>AXGroup</code>
                 </div>
@@ -1738,8 +1866,8 @@ <h3>HTML Element Role Mappings</h3>
                 </td>
             </tr>
             <tr tabindex="-1" id="el-input-date">
-                <th>
-                  <a href="https://www.w3.org/TR/html/sec-forms.html#the-input-element"><code>input</code></a> <span class="el-context">(<a href="https://www.w3.org/TR/html/sec-forms.html#element-attrdef-input-type"><code>type</code></a> attribute in the <a href="https://www.w3.org/TR/html/sec-forms.html#date-state-typedate">Date</a> state)</span>
+              <th>
+                <a href="https://www.w3.org/TR/html/sec-forms.html#the-input-element"><code>input</code></a> <span class="el-context">(<a href="https://www.w3.org/TR/html/sec-forms.html#element-attrdef-input-type"><code>type</code></a> attribute in the <a href="https://www.w3.org/TR/html/sec-forms.html#date-state-typedate">Date</a> state)</span>
               </th>
                 <td class="aria">No corresponding role</td>
                 <td class="ia2">
@@ -1990,7 +2118,7 @@ <h3>HTML Element Role Mappings</h3>
                     <div class="ctrltype">
                         <span class="type">Localized Control Type: </span><code>"number"</code>
                     </div>
-              </td>
+                </td>
                 <td class="atk">
                   <div class="general">
                     If implemented as a spin button, use WAI-ARIA mapping for <a class="core-mapping" href="#role-map-spinbutton"><code>spinbutton</code></a>.
@@ -2259,34 +2387,40 @@ <h3>HTML Element Role Mappings</h3>
                 <th><a data-cite="HTML">`kbd`</a></th>
                 <td class="aria">No corresponding role</td>
                 <td class="ia2">
+                  <!-- TODO add if mapped -->
                   <div class="general">No accessible object.</div>
                   <div class="properties">
                     <span class="type">Text attributes: </span><code>font-family:monospace</code> on the text container
                   </div>
                 </td>
                 <td class="uia">
+                  <!-- TODO add if mapped -->
                   <div class="general">No accessible object. Styles used are exposed by UIA text attribute identifiers of the <code>TextRange</code> Control Pattern implemented on a parent accessible object.
                   </div>
                 </td>
                 <td class="atk">
                   <div class="general">
-                    No accessible object. Mapped into
-                    "font-family:monospace" text attribute on its text
-                    container.
+                    If mapped:
+                  </div>
+                  <div class="role">
+                    <span class="type">Role:</span> `ATK_ROLE_STATIC`
+                  </div>
+                  <div class="general">
+                    Otherwise no accessible object. Mapped into "font-family:monospace" text attribute on its text container.
                   </div>
                 </td>
-                <td class="ax">
-                    <div class="role">
-                        <span class="type">AXRole: </span><code>AXGroup</code>
-                    </div>
-                    <div class="subrole">
-                        <span class="type">AXSubrole: </span><code>(nil)</code>
-                    </div>
-                    <div class="roledesc">
-                        <span class="type">AXRoleDescription: </span><code>"group"</code>
-                    </div>
-                </td>
-                <td class="comments"></td>
+              <td class="ax">
+                <div class="role">
+                  <span class="type">AXRole:</span> `AXGroup`
+                </div>
+                <div class="subrole">
+                  <span class="type">AXSubrole:</span> `(nil)`
+                </div>
+                <div class="roledesc">
+                  <span class="type">AXRoleDescription:</span> `"group"`
+                </div>
+              </td>
+              <td class="comments"></td>
             </tr>
             <tr tabindex="-1" id="el-label">
                 <th><a data-cite="HTML">`label`</a></th>
@@ -2303,9 +2437,9 @@ <h3>HTML Element Role Mappings</h3>
                   </div>
                 </td>
                 <td class="uia">
-                    <div class="ctrltype">
-                        <span class="type">Control Type: </span><code>Text</code>
-                    </div>
+                  <div class="ctrltype">
+                    <span class="type">Control Type: </span><code>Text</code>
+                  </div>
                   <div class="properties">
                     <span class="type">Other properties: </span> When the <code>label</code> element contains an <code>input</code> element, the <code>LabeledBy</code> property for the <code>input</code> element points to the UIA element for the <code>label</code> element.
                     <p>When the <code>label</code> element has a <a href="#att-for-label"><code>for</code></a> attribute referencing another element, the <code>LabeledBy</code> property for the referenced element points to the UIA element for the <code>label</code> element.</p>
@@ -2313,8 +2447,7 @@ <h3>HTML Element Role Mappings</h3>
                 </td>
                 <td class="atk">
                   <div class="role">
-                    <span class="type">Role: </span>
-                    <code>ATK_ROLE_LABEL</code>
+                    <span class="type">Role:</span> <code>ATK_ROLE_LABEL</code>
                   </div>
                   <div class="relations">
                     <span class="type">Relations: </span>
@@ -2341,7 +2474,7 @@ <h3>HTML Element Role Mappings</h3>
                 </td>
                 <td class="comments"></td>
             </tr>
-                <tr tabindex="-1" id="el-legend">
+            <tr tabindex="-1" id="el-legend">
                 <th><a data-cite="HTML">`legend`</a></th>
                 <td class="aria">No corresponding role</td>
                 <td class="ia2">
@@ -2778,8 +2911,7 @@ <h3>HTML Element Role Mappings</h3>
                 </td>
                 <td class="atk">
                   <div class="role">
-                    <span class="type">Role: </span>
-                    <code>ATK_ROLE_SECTION</code>
+                    <span class="type">Role:</span> `ATK_ROLE_SECTION`
                   </div>
                   <div class="general">
                     Styles used are mapped to text attributes on the accessible object.
@@ -2827,7 +2959,7 @@ <h3>HTML Element Role Mappings</h3>
                 </td>
                 <td class="uia">
                   <div class="ctrltype">
-                        <span class="type">Control Type: </span><code>Text</code>
+                    <span class="type">Control Type: </span><code>Text</code>
                   </div>
                   <div class="ctrltype"><span class="type">Localized Control Type:</span> <code>"q"</code></div>
                 </td>
@@ -2866,10 +2998,10 @@ <h3>HTML Element Role Mappings</h3>
                     <span class="type">AXRole: </span><code>AXGroup</code>
                   </div>
                   <div class="subrole">
-                      <span class="type">AXSubrole: </span><code>AXRubyBase</code>
+                    <span class="type">AXSubrole: </span><code>AXRubyBase</code>
                   </div>
                   <div class="roledesc">
-                      <span class="type">AXRoleDescription: </span><code>"group"</code>
+                    <span class="type">AXRoleDescription: </span><code>"group"</code>
                   </div>
                 </td>
                 <td class="comments"></td>
@@ -2880,7 +3012,8 @@ <h3>HTML Element Role Mappings</h3>
                 <td class="aria">No corresponding role</td>
                 <td class="ia2">
                   <div class="general">
-                    No accessible object. No child elements are exposed if <a href="#el-ruby"><code>ruby</code></a> is supported by the browser.
+                    No accessible object.
+                    No child elements are exposed if <a href="#el-ruby">`ruby`</a> is supported by the browser.
                   </div>
                 </td>
                 <td class="uia">
@@ -2890,8 +3023,8 @@ <h3>HTML Element Role Mappings</h3>
                 </td>
                 <td class="atk">
                   <div class="general">
-                    No accessible object. No child elements are
-                    exposed if <a href="#el-ruby"><code>ruby</code></a> is supported by the browser.
+                    No accessible object.
+                    No child elements are exposed if <a href="#el-ruby">`ruby`</a> is supported by the browser.
                   </div>
                 </td>
                 <td class="ax">Not mapped</td>
@@ -2902,7 +3035,8 @@ <h3>HTML Element Role Mappings</h3>
                 <td class="aria">No corresponding role</td>
                 <td class="ia2">
                   <div class="general">
-                    No accessible object. No child elements are exposed if <a href="#el-ruby"><code>ruby</code></a> is supported by the browser.
+                    No accessible object.
+                    No child elements are exposed if <a href="#el-ruby">`ruby`</a> is supported by the browser.
                   </div>
                 </td>
                 <td class="uia">
@@ -2920,10 +3054,10 @@ <h3>HTML Element Role Mappings</h3>
                     <span class="type">AXRole: </span><code>AXGroup</code>
                   </div>
                   <div class="subrole">
-                      <span class="type">AXSubrole: </span><code>AXRubyText</code>
+                    <span class="type">AXSubrole: </span><code>AXRubyText</code>
                   </div>
                   <div class="roledesc">
-                      <span class="type">AXRoleDescription: </span><code>"group"</code>
+                    <span class="type">AXRoleDescription: </span><code>"group"</code>
                   </div>
                 </td>
                 <td class="comments"></td>
@@ -2974,30 +3108,42 @@ <h3>HTML Element Role Mappings</h3>
                 <th><a data-cite="HTML">`s`</a></th>
                 <td class="aria">No corresponding role</td>
                 <td class="ia2">
+                  <!-- TODO add if mapped -->
                   <div class="general">No accessible object.</div>
                   <div class="properties">
-                        <span class="type">Text attributes: </span><code>text-line-through-style:solid</code> on the text container
+                    <span class="type">Text attributes:</span> `text-line-through-style:solid` on the text container
                   </div>
                 </td>
                 <td class="uia">
+                  <!-- TODO add if mapped -->
                   <div class="general">No accessible object. Styles used are exposed by UIA text attribute identifiers of the <code>TextRange</code> Control Pattern implemented on a parent accessible object.
                   </div>
                 </td>
                 <td class="atk">
-                  <div class="general">No accessible object. Exposed as
-                    "text-line-through-style:solid" text attribute on the text container.
+                  <div class="general">
+                    If mapped:
+                  </div>
+                  <div class="role">
+                    <span class="type">Role:</span> `ATK_ROLE_STATIC`
+                  </div>
+                  <div class="general">
+                    Otherwise no accessible object.
+                    Exposed as "text-line-through-style:solid" text attribute on the text container.
                   </div>
                 </td>
                 <td class="ax">
-                    <div class="role">
-                        <span class="type">AXRole: </span><code>AXGroup</code>
-                    </div>
-                    <div class="subrole">
-                        <span class="type">AXSubrole: </span><code>(nil)</code>
-                    </div>
-                    <div class="roledesc">
-                        <span class="type">AXRoleDescription: </span><code>"group"</code>
-                    </div>
+                  <div class="general">
+                    If mapped:
+                  </div>
+                  <div class="role">
+                    <span class="type">AXRole:</span> `AXGroup`
+                  </div>
+                  <div class="subrole">
+                    <span class="type">AXSubrole:</span> `(nil)`
+                  </div>
+                  <div class="roledesc">
+                    <span class="type">AXRoleDescription:</span> `"group"`
+                  </div>
                 </td>
                 <td class="comments"></td>
             </tr>
@@ -3005,30 +3151,38 @@ <h3>HTML Element Role Mappings</h3>
                 <th><a data-cite="HTML">`samp`</a></th>
                 <td class="aria">No corresponding role</td>
                 <td class="ia2">
+                  <!-- TODO add if mapped -->
                   <div class="general">
                     No accessible object. Styles are mapped into text attributes on its text container.
                   </div>
                 </td>
                 <td class="uia">
+                  <!-- TODO add if mapped -->
                   <div class="general">No accessible object. Styles used are exposed by UIA text attribute identifiers of the <code>TextRange</code> Control Pattern implemented on a parent accessible object.
                   </div>
                 </td>
                 <td class="atk">
                   <div class="general">
-                    No accessible object. Styles are mapped into
-                    text attributes on its text container.
+                    If mapped:
+                  </div>
+                  <div class="role">
+                    <span class="type">Role:</span> `ATK_ROLE_STATIC`
+                  </div>
+                  <div class="general">
+                    Otherwise no accessible object.
+                    Styles are mapped into text attributes on its text container.
                   </div>
                 </td>
                 <td class="ax">
-                    <div class="role">
-                        <span class="type">AXRole: </span><code>AXGroup</code>
-                    </div>
-                    <div class="subrole">
-                        <span class="type">AXSubrole: </span><code>(nil)</code>
-                    </div>
-                    <div class="roledesc">
-                        <span class="type">AXRoleDescription: </span><code>"group"</code>
-                    </div>
+                  <div class="role">
+                    <span class="type">AXRole:</span> `AXGroup`
+                  </div>
+                  <div class="subrole">
+                    <span class="type">AXSubrole:</span> `(nil)`
+                  </div>
+                  <div class="roledesc">
+                    <span class="type">AXRoleDescription:</span> `"group"`
+                  </div>
                 </td>
                 <td class="comments"></td>
             </tr>
@@ -3123,93 +3277,127 @@ <h3>HTML Element Role Mappings</h3>
                 <td class="aria">No corresponding role</td>
                 <td class="ia2">
                   <div class="general">No accessible object.</div>
+                  <!-- add if mapped -->
                   <div class="properties">
-                    <span class="type">Text attributes: </span><code>font-size</code> on the text container
+                    <span class="type">Text attributes:</span> `font-size` on the text container
                   </div>
                 </td>
                 <td class="uia">
+                  <!-- TODO add if mapped -->
                   <div class="general">No accessible object. Exposed by <code>FontSize</code> attribute of the <code>TextRange</code> Control Pattern implemented on a parent accessible object.
                   </div>
                 </td>
                 <td class="atk">
                   <div class="general">
-                    No accessible object. Exposed as "font-size"
-                    text attribute on the text container.
+                    If mapped:
+                  </div>
+                  <div class="role">
+                    <span class="type">Role:</span> `ATK_ROLE_STATIC`
+                  </div>
+                  <div class="general">
+                    Otherwise no accessible object. Exposed as "font-size" text attribute on the text container.
                   </div>
                 </td>
                 <td class="ax">
-                    <div class="role">
-                        <span class="type">AXRole: </span><code>AXGroup</code>
-                    </div>
-                    <div class="subrole">
-                        <span class="type">AXSubrole: </span><code>(nil)</code>
-                    </div>
-                    <div class="roledesc">
-                        <span class="type">AXRoleDescription: </span><code>"group"</code>
-                    </div>
+                  <div class="general">
+                    If mapped:
+                  </div>
+                  <div class="role">
+                    <span class="type">AXRole:</span> `AXGroup`
+                  </div>
+                  <div class="subrole">
+                    <span class="type">AXSubrole:</span> `(nil)`
+                  </div>
+                  <div class="roledesc">
+                    <span class="type">AXRoleDescription:</span> `"group"`
+                  </div>
                 </td>
                 <td class="comments"></td>
             </tr>
             <tr tabindex="-1" id="el-source">
-                <th><a data-cite="HTML">`source`</a></th>
-                <td class="aria">No corresponding role</td>
-                <td class="ia2"><div class="general">Not mapped</div></td>
-                <td class="uia"><div class="general">Not mapped</div></td>
-                <td class="atk"><div class="general">Not mapped</div></td>
-                <td class="ax"><div class="general">Not mapped</div></td>
-                <td class="comments"></td>
+              <th><a data-cite="HTML">`source`</a></th>
+              <td class="aria">No corresponding role</td>
+              <td class="ia2"><div class="general">Not mapped</div></td>
+              <td class="uia"><div class="general">Not mapped</div></td>
+              <td class="atk"><div class="general">Not mapped</div></td>
+              <td class="ax"><div class="general">Not mapped</div></td>
+              <td class="comments"></td>
             </tr>
             <tr tabindex="-1" id="el-span">
-                <th><a data-cite="HTML">`span`</a></th>
-                <td class="aria">No corresponding role</td>
-                <td class="ia2"><div class="general">Not mapped</div></td>
-                <td class="uia">
-                    <div class="ctrltype">
-                        <span class="type">Control Type: </span><code>Group</code>
-                    </div>
-                </td>
-                <td class="atk"><div class="general">Not mapped</div></td>
-                <td class="ax">
-                    <div class="role">
-                        <span class="type">AXRole: </span><code>AXGroup</code>
-                    </div>
-                    <div class="subrole">
-                        <span class="type">AXSubrole: </span><code>(nil)</code>
-                    </div>
-                    <div class="roledesc">
-                        <span class="type">AXRoleDescription: </span><code>"group"</code>
-                    </div>
-                </td>
-                <td class="comments"></td>
+              <th>
+                <a data-cite="HTML">`span`</a>
+              </th>
+              <td class="aria">No corresponding role</td>
+              <td class="ia2">
+                <!-- TODO add if mapped -->
+                <div class="general">Not mapped</div>
+              </td>
+              <td class="uia">
+                <div class="ctrltype">
+                  <span class="type">Control Type:</span> `Group`
+                </div>
+              </td>
+              <td class="atk">
+                <div class="general">
+                  If mapped:
+                </div>
+                <span class="type">Role:</span> `ATK_ROLE_STATIC`
+              </td>
+              <td class="ax">
+                <div class="general">
+                  If mapped:
+                </div>
+                <div class="role">
+                  <span class="type">AXRole:</span> `AXGroup`
+                </div>
+                <div class="subrole">
+                  <span class="type">AXSubrole:</span> `(nil)`
+                </div>
+                <div class="roledesc">
+                  <span class="type">AXRoleDescription:</span> `"group"`
+                </div>
+              </td>
+              <td class="comments"></td>
             </tr>
             <tr tabindex="-1" id="el-strong">
                 <th><a data-cite="HTML">`strong`</a></th>
                 <td class="aria">No corresponding role</td>
                 <td class="ia2">
+                  <!-- TODO add if mapped -->
                   <div class="general">
                     No accessible object. Styles used are mapped into text attributes on its text container.
                   </div>
                 </td>
                 <td class="uia">
+                  <!-- TODO add if mapped -->
                   <div class="general">No accessible object. Styles used are exposed by UIA text attribute identifiers of the <code>TextRange</code> Control Pattern implemented on a parent accessible object.
                   </div>
                 </td>
                 <td class="atk">
                   <div class="general">
-                    No accessible object. Styles used are mapped
-                    into text attributes on its text container.
+                    If mapped:
+                  </div>
+                  <div class="role">
+                    <span class="type">Role:</span> `ATK_ROLE_STATIC`
+                  </div>
+                  <div class="general">
+                    Otherwise no accessible object.
+                    Styles used are mapped into text attributes on its text container.
                   </div>
                 </td>
                 <td class="ax">
-                    <div class="role">
-                        <span class="type">AXRole: </span><code>AXGroup</code>
-                    </div>
-                    <div class="subrole">
-                        <span class="type">AXSubrole: </span><code>(nil)</code>
-                    </div>
-                    <div class="roledesc">
-                        <span class="type">AXRoleDescription: </span><code>"group"</code>
-                    </div>
+                  <div class="general">
+                    If mapped:
+                  </div>
+                  <div class="role">
+                    <span class="type">AXRole:</span> `AXGroup`
+                  </div>
+                  <div class="subrole">
+                    <span class="type">AXSubrole:</span> `(nil)`
+                  </div>
+                  <div class="roledesc">
+                    <span class="type">AXRoleDescription:</span> `"group"`
+                  </div>
                 </td>
                 <td class="comments"></td>
             </tr>
@@ -3222,7 +3410,7 @@ <h3>HTML Element Role Mappings</h3>
                 <td class="ax"><div class="general">Not mapped</div></td>
                 <td class="comments">
                   <div class="general">
-                    <b>Note:</b> There are instances where CSS properties can affect what is exposed by accessibility APIs. For instance, <code>display: none</code> or <code>visibility: hidden</code> will remove an element from the accessibility tree and hide its presence from assistive technologies.
+                    <strong>Note:</strong> There are instances where CSS properties can affect what is exposed by accessibility APIs. For instance, <code>display: none</code> or <code>visibility: hidden</code> will remove an element from the accessibility tree and hide its presence from assistive technologies.
                   </div>
                 </td>
             </tr>
@@ -3231,17 +3419,18 @@ <h3>HTML Element Role Mappings</h3>
                 <td class="aria">No corresponding role</td>
                 <td class="ia2">
                   <div class="role">
-                    <span class="type">Roles: </span><code>ROLE_SYSTEM_TEXT</code>; <code>IA2_ROLE_TEXT_FRAME</code>
+                    <span class="type">Roles:</span> `ROLE_SYSTEM_TEXT`; `IA2_ROLE_TEXT_FRAME`
                   </div>
                   <div class="properties">
-                    <span class="type">Text attributes: </span><code>text-position:sub</code>
+                    <span class="type">Text attributes:</span> `text-position:sub`
                   </div>
                 </td>
                 <td class="uia">
                   <div class="ctrltype">
-                      <span class="type">Control Type: </span><code>Text</code>
+                    <span class="type">Control Type:</span> `Text`
                   </div>
-                  <div class="general">Styles used are exposed by <code>IsSubscript</code> attribute of the <code>TextRange</code> Control Pattern implemented on the accessible object.
+                  <div class="general">
+                    Styles used are exposed by `IsSubscript` attribute of the `TextRange` Control Pattern implemented on the accessible object.
                   </div>
                 </td>
                 <td class="atk">
@@ -3251,15 +3440,15 @@ <h3>HTML Element Role Mappings</h3>
                   </div>
                 </td>
                 <td class="ax">
-                    <div class="role">
-                        <span class="type">AXRole: </span><code>AXGroup</code>
-                    </div>
-                    <div class="subrole">
-                        <span class="type">AXSubrole: </span><code>AXSubscriptStyleGroup</code>
-                    </div>
-                    <div class="roledesc">
-                        <span class="type">AXRoleDescription: </span><code>"group"</code>
-                    </div>
+                  <div class="role">
+                    <span class="type">AXRole: </span><code>AXGroup</code>
+                  </div>
+                  <div class="subrole">
+                    <span class="type">AXSubrole: </span><code>AXSubscriptStyleGroup</code>
+                  </div>
+                  <div class="roledesc">
+                    <span class="type">AXRoleDescription: </span><code>"group"</code>
+                  </div>
                 </td>
                 <td class="comments"></td>
             </tr>
@@ -3317,7 +3506,7 @@ <h3>HTML Element Role Mappings</h3>
                 </td>
                 <td class="uia">
                   <div class="ctrltype">
-                      <span class="type">Control Type: </span><code>Text</code>
+                    <span class="type">Control Type: </span><code>Text</code>
                   </div>
                   <div class="general">Styles used are exposed by <code>IsSuperscript</code> attribute of the <code>TextRange</code> Control Pattern implemented on the accessible object.
                   </div>
@@ -3535,23 +3724,55 @@ <h3>HTML Element Role Mappings</h3>
                 <td class="comments"></td>
             </tr>
             <tr tabindex="-1" id="el-u">
-                <th><a data-cite="HTML">`u`</a></th>
-                <td class="aria">No corresponding role</td>
-                <td class="ia2">
-                  <div class="general">No accessible object. Exposed as "text-underline-style:solid" text attribute on its text container.
-                  </div>
-                </td>
-                <td class="uia">
-                  <div class="general">No accessible object. Exposed by <code>UnderlineStyle</code> attribute of the <code>TextRange</code> Control Pattern implemented on a parent accessible object.
-                  </div>
-                </td>
-                <td class="atk">
-                  <div class="general">No accessible object. Exposed as
-                    "text-underline-style:solid" text attribute on its text container.
-                  </div>
-                </td>
-                <td class="ax">?</td>
-                <td class="comments"></td>
+              <th><a data-cite="HTML">`u`</a></th>
+              <td class="aria">No corresponding role</td>
+              <td class="ia2">
+                <div class="general">
+                  If mapped:
+                </div>
+                <!-- TODO add if mapped -->
+                <div class="general">
+                  Otherwise no accessible object.
+                  Exposed as "text-underline-style:solid" text attribute on its text container.
+                </div>
+              </td>
+              <td class="uia">
+                <div class="general">
+                  If mapped:
+                </div>
+                <!-- TODO add if mapped -->
+                <div class="general">
+                  Otherwise no accessible object.
+                  Exposed by `UnderlineStyle` attribute of the `TextRange` Control Pattern implemented on a parent accessible object.
+                </div>
+              </td>
+              <td class="atk">
+                <div class="general">
+                  If mapped:
+                </div>
+                <div class="role">
+                  <span class="type">Role:</span> `ATK_ROLE_STATIC`
+                </div>
+                <div class="general">
+                  Otherwise no accessible object.
+                  Exposed as "text-underline-style:solid" text attribute on its text container.
+                </div>
+              </td>
+              <td class="ax">
+                <div class="general">
+                  If mapped:
+                </div>
+                <div class="role">
+                  <span class="type">AXRole:</span> `AXGroup`
+                </div>
+                <div class="subrole">
+                  <span class="type">AXSubrole:</span> `(nil)`
+                </div>
+                <div class="roledesc">
+                  <span class="type">AXRoleDescription:</span> `"group"`
+                </div>
+              </td>
+              <td class="comments"></td>
             </tr>
             <tr tabindex="-1" id="el-ul">
                 <th><a data-cite="HTML">`ul`</th>
@@ -3566,25 +3787,35 @@ <h3>HTML Element Role Mappings</h3>
                 <th><a data-cite="HTML">`var`</a></th>
                 <td class="aria">No corresponding role</td>
                 <td class="ia2">
+                  <!-- TODO add if mapped -->
                   <div class="general">No accessible object. Styles used are mapped to text attributes on its text container.</div>
                 </td>
                 <td class="uia">
+                  <!-- TODO add if mapped -->
                   <div class="general">No accessible object. Styles used are exposed by UIA text attribute identifiers of the <code>TextRange</code> Control Pattern implemented on a parent accessible object.
                   </div>
                 </td>
                 <td class="atk">
-                  <div class="general">No accessible object. Styles used are mapped to text attributes on its text container.</div>
+                  <div class="general">
+                    If mapped:
+                  </div>
+                  <div class="role">
+                    <span class="type">Role:</span> `ATK_ROLE_STATIC`
+                  </div>
+                  <div class="general">
+                    Otherwise no accessible object. Styles used are mapped to text attributes on its text container.
+                  </div>
                 </td>
                 <td class="ax">
-                    <div class="role">
-                        <span class="type">AXRole: </span><code>AXGroup</code>
-                    </div>
-                    <div class="subrole">
-                        <span class="type">AXSubrole: </span><code>(nil)</code>
-                    </div>
-                    <div class="roledesc">
-                        <span class="type">AXRoleDescription: </span><code>"group"</code>
-                    </div>
+                  <div class="role">
+                    <span class="type">AXRole:</span> `AXGroup`
+                  </div>
+                  <div class="subrole">
+                    <span class="type">AXSubrole:</span> `(nil)`
+                  </div>
+                  <div class="roledesc">
+                    <span class="type">AXRoleDescription:</span> `"group"`
+                  </div>
                 </td>
                 <td class="comments"></td>
             </tr>
@@ -3598,7 +3829,7 @@ <h3>HTML Element Role Mappings</h3>
               </td>
               <td class="uia">
                   <div class="ctrltype">
-                      <span class="type">Control Type: </span><code>Group</code>
+                    <span class="type">Control Type: </span><code>Group</code>
                   </div>
                   <div class="ctrltype"><span class="type">Localized Control Type:</span> <code>"group"</code></div>
                   <div class="general"><b>Note:</b> If the <a href="https://www.w3.org/TR/html/semantics.html#attr-media-controls"><code>controls</code></a> attribute is present, UI controls (e.g. play, volume) are exposed as children of the <a href="https://www.w3.org/TR/html/semantics-embedded-content.html#the-video-element"><code>video</code></a> element in the <a class="termref">accessibility tree</a>, and mapped as appropriate for the type of control (e.g. <a class="core-mapping" href="#role-map-button"><code>button</code></a> or <a class="core-mapping" href="#role-map-slider"><code>slider</code></a>).</div>
@@ -3629,25 +3860,25 @@ <h3>HTML Element Role Mappings</h3>
                 <td class="aria">No corresponding role</td>
                 <td class="ia2">
                   <div class="general">
-                    If a line break is added, expose it with <code>IAccessibleText</code> on the text container
+                    If a line break is added, expose it with `IAccessibleText` on the text container.
                   </div>
                 </td>
                 <td class="uia"><div class="general">Not mapped</div></td>
                 <td class="atk">
                   <div class="general">
-                    A line break if added is exposed via Text interface on its text container
+                    A line break, if added, is exposed via Text interface on its text container.
                   </div>
                 </td>
                 <td class="ax">
-                    <div class="role">
-                        <span class="type">AXRole: </span><code>AXGroup</code>
-                    </div>
-                    <div class="subrole">
-                        <span class="type">AXSubrole: </span><code>(nil)</code>
-                    </div>
-                    <div class="roledesc">
-                        <span class="type">AXRoleDescription: </span><code>"group"</code>
-                    </div>
+                  <div class="role">
+                    <span class="type">AXRole: </span><code>AXGroup</code>
+                  </div>
+                  <div class="subrole">
+                    <span class="type">AXSubrole: </span><code>(nil)</code>
+                  </div>
+                  <div class="roledesc">
+                    <span class="type">AXRoleDescription: </span><code>"group"</code>
+                  </div>
                 </td>
                 <td class="comments"></td>
             </tr>
@@ -3659,10 +3890,18 @@ <h3>HTML Element Role Mappings</h3>
       <h3>HTML Attribute State and Property Mappings</h3>
       <p><strong>Notes:</strong> </p>
       <ul>
-        <li>HTML attributes with default WAI-ARIA state and property semantics MUST be mapped to platform <a class="termref">accessibility APIs</a> according to those WAI-ARIA state and property mappings as defined in the [[core-aam-1.2]] specification.</li>
-        <li>A '?' in a cell indicates the data has yet to be provided.</li>
-        <li>"Not mapped" (Not Applicable) means the attribute does not need to be exposed via an <a class="termref">accessibility API</a>. This is usually because the attribute is not displayed as part of the user interface.</li>
-        <li>All elements having an accessible object in IAccessible2 mapping are supposed to implement IAccessible, IAccessible2 and IAccessible2_2 interfaces.</li>
+        <li>
+          HTML attributes with default WAI-ARIA state and property semantics MUST be mapped to platform <a class="termref">accessibility APIs</a> according to those WAI-ARIA state and property mappings as defined in the [[core-aam-1.2]] specification.
+        </li>
+        <li>
+          A '?' in a cell indicates the data has yet to be provided.
+        </li>
+        <li>
+          "Not mapped" (Not Applicable) means the attribute does not need to be exposed via an <a class="termref">accessibility API</a>. This is usually because the attribute is not displayed as part of the user interface.
+        </li>
+        <li>
+          All elements having an accessible object in IAccessible2 mapping are supposed to implement IAccessible, IAccessible2 and IAccessible2_2 interfaces.
+        </li>
       </ul>
       <div class="table-container">
         <table class="map-table attributes" id="attribute-mapping-table">