diff --git a/index.html b/index.html
index 765a2fb9..4a7d04f8 100644
--- a/index.html
+++ b/index.html
@@ -1112,7 +1112,7 @@ <h2 id="docconformance">
           </tr>
           <tr id="el-img" tabindex="-1">
             <td>
-              <code><a>img</a> with <a data-cite=
+              <code><a>img</a></code> with <code><a data-cite=
               "html/embedded-content.html#attr-img-alt">alt</a>="some text"</code>
             </td>
             <td>
@@ -1120,9 +1120,21 @@ <h2 id="docconformance">
             </td>
             <td>
               <p>
-                <a><strong>Any</strong> `role`</a> except
-                <a href="#index-aria-none">`none`</a>
-                or <a href="#index-aria-presentation">`presentation`</a>.
+                Roles:
+                <a href="#index-aria-button">`button`</a>,
+                <a href="#index-aria-checkbox">`checkbox`</a>,
+                <a href="#index-aria-link">`link`</a>,
+                <a href="#index-aria-menuitem">`menuitem`</a>,
+                <a href="#index-aria-menuitemcheckbox">`menuitemcheckbox`</a>,
+                <a href="#index-aria-menuitemradio">`menuitemradio`</a>,
+                <a href="#index-aria-option">`option`</a>,
+                <a href="#index-aria-progressbar">`progressbar`</a>,
+                <a href="#index-aria-scrollbar">`scrollbar`</a>,
+                <a href="#index-aria-separator">`separator`</a>,
+                <a href="#index-aria-slider">`slider`</a>,
+                <a href="#index-aria-switch">`switch`</a>,
+                <a href="#index-aria-tab">`tab`</a> or
+                <a href="#index-aria-treeitem">`treeitem`</a>
               </p>
               <p>
                 <a href="#index-aria-global">Global `aria-*` attributes</a> and
@@ -1133,7 +1145,7 @@ <h2 id="docconformance">
           </tr>
           <tr id="el-img-empty-alt" tabindex="-1">
             <td>
-              <code><a>img</a> with <a data-cite=
+              <code><a>img</a></code> with <code><a data-cite=
               "html/embedded-content.html#attr-img-alt">alt</a>=""</code>
             </td>
             <td>
@@ -1153,19 +1165,18 @@ <h2 id="docconformance">
           </tr>
           <tr id="el-img-no-alt" tabindex="-1">
             <td>
-              <code><a>img</a> with no <a data-cite="html/images.html#unknown-images">alt</a>=""</code>
+              <code><a>img</a></code> without <code><a data-cite="html/images.html#unknown-images">alt</a></code> attribute
             </td>
             <td>
               <code>role=<a href="#index-aria-img">img</a></code>
             </td>
             <td>
               <p>
-                <a><strong>Any</strong> `role`</a>
+                If not provided an author defined accessible name by other methods: <strong class="nosupport">No `role`</strong>, and <strong>no `aria-*` attributes</strong> except
+                `aria-hidden`.
               </p>
               <p>
-                <a href="#index-aria-global">Global `aria-*` attributes</a> and
-                any `aria-*` attributes applicable to the allowed roles and
-                implied role (if any).
+                Otherwise, if the `img` has an author defined accessible name, see <a href="#el-img">`img alt="some text"`</a>.
               </p>
             </td>
           </tr>
@@ -2410,10 +2421,7 @@ <h2 id="docconformance">
             </td>
             <td>
               <p>
-                Role: `button` with `aria-expanded=true` if the
-                parent (`details`) element's <a data-cite=
-                "html/interactive-elements.html#attr-details-open">`open`</a>
-                attribute is present, `aria-expanded=false` otherwise.
+                <strong class="nosupport">No `role`</strong>
               </p>
               <p>
                 <a href="#index-aria-global">Global `aria-*` attributes</a> and