diff --git a/src/compatibility/5.1/android-5.1-cdd.html b/src/compatibility/5.1/android-5.1-cdd.html
index 6b46dbc..70ecd07 100644
--- a/src/compatibility/5.1/android-5.1-cdd.html
+++ b/src/compatibility/5.1/android-5.1-cdd.html
@@ -1079,7 +1079,7 @@
 namespaces. Additionally, if a device implementation includes custom APIs
 outside the standard Android namespace, those APIs MUST be packaged in an
 Android shared library so that only apps that explicitly use them (via the
-<uses-library> mechanism) are affected by the increased memory usage of such
+&lt;uses-library&gt; mechanism) are affected by the increased memory usage of such
 APIs.</p>
 
 <p>If a device implementer proposes to improve one of the package namespaces above
@@ -1622,7 +1622,7 @@
 <p>(AAC LC)</td>
     <td>REQUIRED<sup>1</sup></td>
     <td>REQUIRED</td>
-    <td>Support for mono/stereo/5.0/5.12 content with standard sampling rates from 8 to
+    <td>Support for mono/stereo/5.0/5.1<sup>2</sup> content with standard sampling rates from 8 to
 48 kHz.</td>
     <td>
     <ul>
@@ -1636,7 +1636,7 @@
     <td>MPEG-4 HE AAC Profile (AAC+)</td>
     <td>REQUIRED<sup>1</sup><br>(Android 4.1+)</td>
     <td>REQUIRED</td>
-    <td>Support for mono/stereo/5.0/5.12 content with standard sampling rates from 16
+    <td>Support for mono/stereo/5.0/5.1<sup>2</sup> content with standard sampling rates from 16
 to 48 kHz.</td>
     <td></td>
  </tr>
@@ -1646,7 +1646,7 @@
 <p>Profile (enhanced AAC+)</td>
     <td> </td>
     <td>REQUIRED</td>
-    <td>Support for mono/stereo/5.0/5.12 content with standard sampling rates from 16
+    <td>Support for mono/stereo/5.0/5.1<sup>2</sup> content with standard sampling rates from 16
 to 48 kHz.</td>
     <td></td>
  </tr>
@@ -1837,7 +1837,7 @@
     <td>3GPP (.3gp)</td>
  </tr>
  <tr>
-    <td>VP83</td>
+    <td>VP8<sup>3</sup></td>
     <td>REQUIRED<sup>2</sup></p>
 
 <p>(Android 4.3+)</td>
@@ -1847,7 +1847,7 @@
     <td>See <a href="#5_2_video_encoding">section 5.2</a> and <a href="#5_3_video_decoding">5.3</a> for details</td>
     <td><ul>
     <li class="table_list">WebM (.webm) [<a href="http://www.webmproject.org/">Resources, 110</a></li>
-    <li class="table_list">Matroska (.mkv, Android 4.0+)4</li></ul></td>
+    <li class="table_list">Matroska (.mkv, Android 4.0+)<sup>4</sup></li></ul></td>
  </tr>
  <tr>
     <td>VP9</td>
@@ -1856,7 +1856,7 @@
     <td>See <a href="#5_3_video_decoding">section 5.3</a> for details</td>
     <td><ul>
     <li class="table_list">WebM (.webm) [<a href="http://www.webmproject.org/">Resources, 110</a>]</li>
-    <li class="table_list">Matroska (.mkv, Android 4.0+)4</li></ul></td>
+    <li class="table_list">Matroska (.mkv, Android 4.0+)<sup>4</sup></li></ul></td>
  </tr>
 </table>
 
@@ -2507,7 +2507,7 @@
 <p>Devices MUST NOT change their reported screen size at any time.</p>
 
 <p>Applications optionally indicate which screen sizes they support via the
-<supports-screens> attribute in the AndroidManifest.xml file. Device
+&lt;supports-screens&gt; attribute in the AndroidManifest.xml file. Device
 implementations MUST correctly honor applications' stated support for small,
 normal, large, and xlarge screens, as described in the Android SDK
 documentation.</p>
@@ -2597,7 +2597,7 @@
 OpenGL ES 1.0, OpenGL ES 2.0, OpenGL ES 3.0 or OpenGL 3.1. That is:</p>
 
 <ul>
-  <li>The managed APIs (such as via the GLES10.getString()method MUST report support
+  <li>The managed APIs (such as via the GLES10.getString() method) MUST report support
 for OpenGL ES 1.0 and OpenGL ES 2.0.</li>
   <li>The native C/C++ OpenGL APIs (APIs available to apps via libGLES_v1CM.so,
 libGLES_v2.so, or libEGL.so) MUST report support for OpenGL ES 1.0 and OpenGL
@@ -2944,14 +2944,14 @@
     <td><a href="http://developer.android.com/reference/android/view/KeyEvent.html#KEYCODE_DPAD_UP">D-pad up</a><sup>1</sup></p>
 
 <p><a href="http://developer.android.com/reference/android/view/KeyEvent.html#KEYCODE_DPAD_DOWN">D-pad down</a><sup>1</sup></td>
-    <td>0x01 0x00393</td>
+    <td>0x01 0x0039<sup>3</sup></td>
     <td><a href="http://developer.android.com/reference/android/view/MotionEvent.html#AXIS_HAT_Y">AXIS_HAT_Y</a><sup>4</sup></td>
  </tr>
  <tr>
     <td><a href="http://developer.android.com/reference/android/view/KeyEvent.html#KEYCODE_DPAD_LEFT">D-pad left</a>1</p>
 
 <p><a href="http://developer.android.com/reference/android/view/KeyEvent.html#KEYCODE_DPAD_RIGHT">D-pad right</a><sup>1</sup></td>
-    <td>0x01 0x00393</td>
+    <td>0x01 0x0039<sup>3</sup></td>
     <td><a href="http://developer.android.com/reference/android/view/MotionEvent.html#AXIS_HAT_X">AXIS_HAT_X</a><sup>4</sup></td>
  </tr>
  <tr>
@@ -4067,7 +4067,7 @@
 
 <p>Alternate runtimes MUST NOT be granted access to resources protected by
 permissions not requested in the runtime&rsquo;s AndroidManifest.xml file via the
-<uses-permission> mechanism.</p>
+&lt;uses-permission&gt; mechanism.</p>
 
 <p>Alternate runtimes MUST NOT permit applications to make use of features
 protected by Android permissions restricted to system applications.</p>