diff --git a/index.html b/index.html
index a8a37159..96835156 100644
--- a/index.html
+++ b/index.html
@@ -155,6 +155,8 @@ <h2>Introduction</h2>
       <li>[[[core-aam-1.2]]]</li>
       <li>HTML Accessibility API Mappings 1.0 (this specification)</li>
       <li>[[[svg-aam-1.0]]]</li>
+      <!-- mathml aam link needs a shortcode, this doesn't appear to exit right now -->
+      <li><cite><a href="https://w3c.github.io/mathml-aam/">MathML AAM 1.0</a></cite></li>
     </ul>
     <section id="intro_aapi">
       <h3>Accessibility APIs</h3>
@@ -239,7 +241,7 @@ <h3>HTML Element Role Mappings</h3>
             <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>
+        <li>
           <strong>AXAPI:</strong>
           <ul>
             <li>User agents should return a user-presentable, localized string value for the Mac Accessibility AXRoleDescription.</li>
@@ -2704,12 +2706,13 @@ <h3>HTML Element Role Mappings</h3>
               <th>
                 <a data-cite="html/embedded-content-other.html#mathml">`math`</a>
               </th>
-              <td class="aria"><a class="core-mapping" href="#role-map-math">`math`</a> role</td>
-              <td class="ia2"><div class="general">Use WAI-ARIA mapping</div></td>
-              <td class="uia"><div class="general">Use WAI-ARIA mapping</div></td>
-              <td class="atk"><div class="general">Use WAI-ARIA mapping</div></td>
-              <td class="ax"><div class="general">Use WAI-ARIA mapping</div></td>
-              <td class="comments"></td>
+              <td class="aria">See comments</td>
+              <td class="ia2">See comments</td>
+              <td class="uia">See comments</td>
+              <td class="atk">See comments</td>
+              <td class="ax">See comments</td>
+              <td class="comments">
+                Mapping for `math` is defined by <a href="https://w3c.github.io/mathml-aam/">MathML AAM 1.0</a>.
             </tr>
             <tr tabindex="-1" id="el-menu">
               <th>
@@ -3604,13 +3607,15 @@ <h3>HTML Element Role Mappings</h3>
             <tr tabindex="-1" id="el-svg">
               <th><a data-cite="html/embedded-content-other.html#svg-0">`svg`</a></th>
               <td class="aria">
-                <a class="graphics-mapping" href="https://www.w3.org/TR/graphics-aam-1.0/#role-map-graphics-document">`graphics-document` role</a>
+                See comments
+              </td>
+              <td class="ia2">See comments</td>
+              <td class="uia">See comments</td>
+              <td class="atk">See comments</td>
+              <td class="ax">See comments</td>
+              <td class="comments">
+                Mapping for `svg` is defined by [[[svg-aam-1.0]]]. See also <a href="https://w3c.github.io/graphics-aam/#mapping_role_table">Graphics Accessibility API Role Mappings</a>
               </td>
-              <td class="ia2"><div class="general">Use WAI-ARIA mapping</div></td>
-              <td class="uia"><div class="general">Use WAI-ARIA mapping</div></td>
-              <td class="atk"><div class="general">Use WAI-ARIA mapping</div></td>
-              <td class="ax"><div class="general">Use WAI-ARIA mapping</div></td>
-              <td class="comments"></td>
             </tr>
             <tr tabindex="-1" id="el-table">
               <th><a data-cite="HTML">`table`</a></th>