diff --git a/src/accessories/audio.jd b/src/accessories/audio.jd
index 1674710..f4a316c 100644
--- a/src/accessories/audio.jd
+++ b/src/accessories/audio.jd
@@ -38,11 +38,11 @@
 <h2 id="audio-over-usb">Audio over USB</h2>
 <p>Android can use USB in several modes:</p>
   <ul>
-    <li>debug
+    <li>development
     <li>accessory
     <li>host
   </ul>
-<p>In the traditional debug mode, there is no audio capability.</p>
+<p>In the development mode, there is no audio capability.</p>
 <p>Accessory mode is provided by the Open Accessory (AOA) protocol version 2.0.
 There is limited audio capability in accessory mode, as described in <a
 href="custom.html#audio-over-usb">Connecting custom audio over USB</a>.</p>
diff --git a/src/devices/audio.jd b/src/devices/audio.jd
index 660ec7e..dd3109b 100644
--- a/src/devices/audio.jd
+++ b/src/devices/audio.jd
@@ -17,7 +17,7 @@
     limitations under the License.
 -->
 <p>
-  Android's audio Hardware Abstraction Layer (HAL) connects the higher level, audio-specific
+  Android's audio Hardware Abstraction Layer (HAL) connects the higher-level, audio-specific
   framework APIs in <a href="http://developer.android.com/reference/android/media/package-summary.html">android.media</a>
   to the underlying audio driver and hardware. 
 </p>
@@ -78,7 +78,7 @@
     and that you must implement to have your audio hardware function correctly. The audio HAL
     interfaces are located in
 <code>hardware/libhardware/include/hardware</code>. See <a
-href="{@docRoot}devices/halref/audio_8h_source.html">audio.h</a> for additional details.
+href="{@docRoot}devices/halref/audio_8h_source.html">&lt;hardware/audio.h&gt;</a> for additional details.
   </dd>
   <dt>
     Kernel Driver
@@ -93,6 +93,13 @@
 </p>
   </dd>
 </dl>
+<p>
+Not shown: Android native audio based on OpenSL ES.
+This API is exposed as part of
+<a href="https://developer.android.com/tools/sdk/ndk/index.html">Android NDK</a>,
+and is at the same architecture level as
+<a href="http://developer.android.com/reference/android/media/package-summary.html">android.media</a>.
+</p>
 
 <p>
    See the rest of the pages within the Audio section for implementation
diff --git a/src/devices/audio_debugging.jd b/src/devices/audio_debugging.jd
index 9c9b2fb..b54cf59 100644
--- a/src/devices/audio_debugging.jd
+++ b/src/devices/audio_debugging.jd
@@ -81,10 +81,10 @@
 <p>
 If the directory does not exist, create it as follows:
 </p>
-<code>
+<pre>
 mkdir /data/misc/media
 chown media:media /data/misc/media
-</code>
+</pre>
 </li>
 <li><code>echo af.tee=# &gt; /data/local.prop</code>
 <br />Where the <code>af.tee</code> value is a number described below.
diff --git a/src/devices/audio_latency.jd b/src/devices/audio_latency.jd
index 25865bc..f4a6367 100644
--- a/src/devices/audio_latency.jd
+++ b/src/devices/audio_latency.jd
@@ -62,7 +62,7 @@
 <p>
   A better approach is to understand the causes of the
   underruns and then correct those.  This eliminates the
-  audible artifacts and may even permit even smaller or fewer buffers
+  audible artifacts and may permit even smaller or fewer buffers
   and thus reduce latency.
 </p>
 
diff --git a/src/devices/audio_terminology.jd b/src/devices/audio_terminology.jd
index e832153..601b8eb 100644
--- a/src/devices/audio_terminology.jd
+++ b/src/devices/audio_terminology.jd
@@ -313,7 +313,7 @@
 be implemented that way.  An ADC is usually preceded by a low-pass filter
 to remove any high frequency components that are not representable using
 the desired sample rate.  See Wikipedia article
-<a href="http://en.wikipedia.org/wiki/Analog-to-digital_converter">Analog-to-digital_converter</a>.
+<a href="http://en.wikipedia.org/wiki/Analog-to-digital_converter">Analog-to-digital converter</a>.
 </dd>
 
 <dt>AP</dt>
@@ -389,9 +389,9 @@
 range.  In practice, sample rates of 44.1 kHz and 48 kHz are commonly
 used, with Nyquist frequencies of 22.05 kHz and 24 kHz respectively.
 See
-<a href="http://en.wikipedia.org/wiki/Nyquist_frequency" target="_android">Nyquist frequency</a>
+<a href="http://en.wikipedia.org/wiki/Nyquist_frequency">Nyquist frequency</a>
 and
-<a href="http://en.wikipedia.org/wiki/Hearing_range" target="_android">Hearing range</a>
+<a href="http://en.wikipedia.org/wiki/Hearing_range">Hearing range</a>
 for more information.
 </dd>
 
@@ -473,7 +473,7 @@
 <dd>
 Service responsible for all actions that require a policy decision
 to be made first, such as opening a new I/O stream, re-routing after a
-change and stream volume management.
+change, and stream volume management.
 </dd>
 
 <dt>AudioRecord</dt>
@@ -522,7 +522,7 @@
 
 <dt>fast track</dt>
 <dd>
-An AudioTrack client with lower latency but fewer features, on some devices.
+An AudioTrack or AudioRecord client with lower latency but fewer features, on some devices.
 </dd>
 
 <dt>MediaPlayer</dt>
@@ -629,7 +629,7 @@
 
 <dt>track</dt>
 <dd>
-An audio stream, controlled by the AudioTrack API.
+An audio stream, controlled by the AudioTrack or AudioRecord API.
 </dd>
 
 <dt>volume attenuation curve</dt>