diff --git a/src/devices/audio.jd b/src/devices/audio.jd
index 4435494..c054954 100644
--- a/src/devices/audio.jd
+++ b/src/devices/audio.jd
@@ -27,7 +27,7 @@
   source code that is involved in the implementation:
 </p>
 <p>
-  <img src="images/audio_hal.png">
+  <img src="images/audio_hal.png" alt="Audio architecture">
 </p>
 <dl>
   <dt>
diff --git a/src/devices/audio_implement.jd b/src/devices/audio_implement.jd
index 9267d9e..26aa5f5 100644
--- a/src/devices/audio_implement.jd
+++ b/src/devices/audio_implement.jd
@@ -98,7 +98,6 @@
 
   <p>AudioFlinger's mixer downmixes the content to stereo
     automatically when sent to an audio device that does not support multichannel audio.</p>
-</p>
 
 <h3 id="codecs">Media codecs</h3>
 
@@ -193,7 +192,6 @@
   <li><a
 href="http://developer.android.com/reference/android/media/audiofx/NoiseSuppressor.html">Noise Suppression</a></li>
 </ul>
-</p>
 
 
 <p>Pre-processing effects are always paired with the use case mode in which the pre-processing is requested. In Android
@@ -203,14 +201,14 @@
 inputSource)</code>. The following sources are exposed to developers:
 </p>
 <ul>
-<code><li>android.media.MediaRecorder.AudioSource.CAMCORDER</li></code>
-<code><li>android.media.MediaRecorder.AudioSource.VOICE_COMMUNICATION</li></code>
-<code><li>android.media.MediaRecorder.AudioSource.VOICE_CALL</li></code>
-<code><li>android.media.MediaRecorder.AudioSource.VOICE_DOWNLINK</li></code>
-<code><li>android.media.MediaRecorder.AudioSource.VOICE_UPLINK</li></code>
-<code><li>android.media.MediaRecorder.AudioSource.VOICE_RECOGNITION</li></code>
-<code><li>android.media.MediaRecorder.AudioSource.MIC</li></code>
-<code><li>android.media.MediaRecorder.AudioSource.DEFAULT</li></code>
+<li><code>android.media.MediaRecorder.AudioSource.CAMCORDER</code></li>
+<li><code>android.media.MediaRecorder.AudioSource.VOICE_COMMUNICATION</code></li>
+<li><code>android.media.MediaRecorder.AudioSource.VOICE_CALL</code></li>
+<li><code>android.media.MediaRecorder.AudioSource.VOICE_DOWNLINK</code></li>
+<li><code>android.media.MediaRecorder.AudioSource.VOICE_UPLINK</code></li>
+<li><code>android.media.MediaRecorder.AudioSource.VOICE_RECOGNITION</code></li>
+<li><code>android.media.MediaRecorder.AudioSource.MIC</code></li>
+<li><code>android.media.MediaRecorder.AudioSource.DEFAULT</code></li>
 </ul>
 
 <p>The default pre-processing effects that are applied for each <code>AudioSource</code> are
diff --git a/src/devices/audio_terminology.jd b/src/devices/audio_terminology.jd
index c21e595..0cd25a4 100644
--- a/src/devices/audio_terminology.jd
+++ b/src/devices/audio_terminology.jd
@@ -166,7 +166,7 @@
 To increase the number of channels, e.g. from mono to stereo, or from stereo to surround sound.
 This can be accomplished by duplication, panning, or more advanced signal processing.
 Compare to "downmixing".
-</dl>
+</dd>
 
 <dt>virtualizer</dt>
 <dd>
@@ -179,6 +179,8 @@
 Loudness, the subjective strength of an audio signal.
 </dd>
 
+</dl>
+
 <h3 id="hardwareTerms">Hardware and Accessories</h3>
 
 <p>
@@ -294,6 +296,8 @@
 an application to the transducer, or vice-versa.
 </p>
 
+<dl>
+
 <dt>ADC</dt>
 <dd>
 Analog to digital converter, a module that converts an analog signal
@@ -364,7 +368,7 @@
 target="_android">Pulse-width modulation</a>.
 </dd>
 
-</p>
+</dl>
 
 <h2 id="androidSpecificTerms">Android-Specific Terms</h2>
 
@@ -436,7 +440,6 @@
 <a href="http://developer.android.com/reference/android/media/AudioRecord.html"
 target="_android">android.media.AudioRecord</a>.
 </dd>
-</dd>
 
 <dt>AudioResampler</dt>
 <dd>
@@ -535,7 +538,6 @@
 <a href="http://developer.android.com/reference/android/media/SoundPool.html"
 target="_android">android.media.SoundPool</a>.
 </dd>
-</dd>
 
 <dt>Stagefright</dt>
 <dd>
@@ -609,5 +611,3 @@
 
 </dl>
 
-</p>
-
diff --git a/src/devices/audio_warmup.jd b/src/devices/audio_warmup.jd
index d2b5c28..0a0ec04 100644
--- a/src/devices/audio_warmup.jd
+++ b/src/devices/audio_warmup.jd
@@ -55,7 +55,7 @@
   the hardware itself might have its own power logic beyond the three seconds that AudioFlinger has.</li>
   <li>Press Home, and you should hear a click sound.</li>
   <li>Run the following command to receive the measured warmup:
-  <pre>adb shell dumpsys media.audio_flinger | grep measuredWarmup</code></pre>
+  <br /><code>adb shell dumpsys media.audio_flinger | grep measuredWarmup</code>
 
 <p>
 You should see output like this:
@@ -78,8 +78,8 @@
 <li>
   Take five measurements and record them all, as well as the mean.
   If they are not all approximately the same,
-  then it’s likely that a measurement is incorrect.
-  For example, if you don’t wait long enough after the audio has been off,
+  then it's likely that a measurement is incorrect.
+  For example, if you don't wait long enough after the audio has been off,
   you will see a lower warmup time than the mean value.
 </li>
 </ol>
@@ -106,6 +106,7 @@
   <li>Leaving circuits powered on or not reconfiguring clocks (increases idle power consumption)
   <li>Caching computed parameters</li>
   </ul>
+<p>
   However, beware of excessive optimization. You may find that you
   need to tradeoff between low warmup time versus
   lack of popping at power transitions.