diff --git a/src/devices/audio/images/loopback_assembled.png b/src/devices/audio/images/loopback_assembled.jpg
similarity index 100%
rename from src/devices/audio/images/loopback_assembled.png
rename to src/devices/audio/images/loopback_assembled.jpg
Binary files differ
diff --git a/src/devices/audio/latency.jd b/src/devices/audio/latency.jd
index cf856a5..9d381e5 100644
--- a/src/devices/audio/latency.jd
+++ b/src/devices/audio/latency.jd
@@ -167,7 +167,7 @@
   and reduce power consumption while optimizing performance.
   <a href="http://en.wikipedia.org/wiki/Thermal_management_of_electronic_devices_and_systems">Thermal management</a>
   and <a href="http://en.wikipedia.org/wiki/Computer_cooling">computer cooling</a>
-  are similar, but seek to measure and control heat to avoid damage due to excess heat.
+  are similar but seek to measure and control heat to avoid damage due to excess heat.
   In the Linux kernel, the CPU
   <a href="http://en.wikipedia.org/wiki/Governor_%28device%29">governor</a>
   is responsible for low-level policy, while user mode configures high-level policy.
diff --git a/src/devices/audio/latency_measure.jd b/src/devices/audio/latency_measure.jd
index ffefda2..411e048 100644
--- a/src/devices/audio/latency_measure.jd
+++ b/src/devices/audio/latency_measure.jd
@@ -101,8 +101,8 @@
   (Larsen effect) test. This provides a crude measure of combined output
   and input latency by timing an impulse response loop. This test is not very useful
   for detailed analysis
-  by itself because of the nature of the test, but it can be useful for calibrating 
-  other tests, and for establishing an upper bound.</p>
+  by itself because of the nature of the test, but it can be useful for
+  calibrating other tests, and for establishing an upper bound.</p>
 
 <p>To conduct this test:</p>
 <ol>
@@ -129,10 +129,10 @@
 located in the <code>audio_utils</code> library.
 </p>
 
-<h3 id="funplug">Audio Loopback Dongle</h3>
+<h3 id="loopback">Audio Loopback Dongle</h3>
 
 <p>
-  The <a href="funplug.html">Dr. Rick O'Rang audio loopback dongle</a> is handy for
+  The <a href="loopback.html">Dr. Rick O'Rang audio loopback dongle</a> is handy for
   measuring round-trip latency over the headset connector.
   The image below demonstrates the result of injecting an impulse
   into the loop once, and then allowing the feedback loop to oscillate.
diff --git a/src/devices/audio/funplug.jd b/src/devices/audio/loopback.jd
similarity index 95%
rename from src/devices/audio/funplug.jd
rename to src/devices/audio/loopback.jd
index 443f3a6..933972f 100644
--- a/src/devices/audio/funplug.jd
+++ b/src/devices/audio/loopback.jd
@@ -36,7 +36,7 @@
 via the Larsen effect (feedback loop).
 </p>
 
-<h2 id="funplugCircuit">Circuit</h2>
+<h2 id="loopbackCircuit">Circuit</h2>
 
 <img src="images/loopback_circuit.png" alt="circuit" id="figure1" />
 <p class="img-caption">
@@ -50,7 +50,7 @@
 the audio loopback dongle is a US/CTIA pinout Tip Ring Ring Shield (TRRS) plug.
 </p>
 
-<h2 id="funplugAssembled">Assembled</h2>
+<h2 id="loopbackAssembled">Assembled</h2>
 
 <img src="images/loopback_assembled.jpg" alt="fully assembled" id="figure2" />
 <p class="img-caption">
diff --git a/src/devices/audio/terminology.jd b/src/devices/audio/terminology.jd
index a6b1b7a..fc71197 100644
--- a/src/devices/audio/terminology.jd
+++ b/src/devices/audio/terminology.jd
@@ -84,7 +84,7 @@
 
 <dt>DSD</dt>
 <dd>
-A proprietary audio encoding based on
+Direct Stream Digital, a proprietary audio encoding based on
 <a href="http://en.wikipedia.org/wiki/Pulse-density_modulation">pulse-density modulation</a>.
 Whereas PCM encodes a waveform as a sequence of individual audio samples of multiple bits,
 DSD encodes a waveform as a sequence of bits at a very high sample rate.
@@ -94,7 +94,7 @@
 as it can be difficult to apply traditional DSP algorithms to DSD.
 DSD is used in
 <a href="http://en.wikipedia.org/wiki/Super_Audio_CD">Super Audio CD</a>
-(SACD), and in DSD over PCM (DoP) for USB.
+(SACD) and in DSD over PCM (DoP) for USB.
 See the Wikipedia article
 <a href="http://en.wikipedia.org/wiki/Direct_Stream_Digital">Digital Stream Digital<a/>
 for more information.
@@ -137,7 +137,7 @@
 
 <dt>HD audio</dt>
 <dd>
-High Definition audio, a synonym for "high-resolution audio."
+High-Definition audio, a synonym for "high-resolution audio."
 Not to be confused with Intel High Definition Audio.
 </dd>
 
@@ -181,7 +181,7 @@
 A <a href="http://en.wikipedia.org/wiki/Lossy_compression">lossy data compression</a>
 algorithm attempts to preserve the most important features of media across
 encoding and decoding.  The result of decoding any previously encoded
-data is perceptually similar to the original data, but is not identical.
+data is perceptually similar to the original data, but it is not identical.
 Examples of lossy audio compression algorithms include MP3 and AAC.
 As analog values are from a continuous domain, whereas digital values are discrete,
 ADC and DAC are lossy conversions with respect to amplitude.  See also "transparency."
@@ -286,7 +286,7 @@
 <dt>transparency</dt>
 <dd>
 The ideal result of lossy data compression, as stated in the
-<a href="http://en.wikipedia.org/wiki/Transparency_%28data_compression%29">Transparency Wikipedia article</a>.
+<a href="http://en.wikipedia.org/wiki/Transparency_%28data_compression%29">Transparency</a> Wikipedia article.
 A lossy data conversion is said to be transparent if it is perceptually indistinguishable from the
 original by a human subject.
 </dd>
@@ -587,7 +587,7 @@
 
 <dt>audio device</dt>
 <dd>
-Any audio I/O end-point which is backed by a HAL implementation.
+Any audio I/O end-point that is backed by a HAL implementation.
 </dd>
 
 <dt>AudioEffect</dt>
diff --git a/src/devices/audio/usb.jd b/src/devices/audio/usb.jd
index 147bfa3..b885f60 100644
--- a/src/devices/audio/usb.jd
+++ b/src/devices/audio/usb.jd
@@ -555,7 +555,7 @@
 <li>enable generic USB host support at the framework level
 via the <code>android.hardware.usb.host.xml</code> feature flag</li>
 <li>enable all kernel features needed: USB host mode, USB audio, isochronous transfer mode;
-see <a href="{@docRoot}/devices/tech/kernel.html">Android Kernel Configuration</a></li>
+see <a href="{@docRoot}devices/tech/kernel.html">Android Kernel Configuration</a></li>
 <li>keep up-to-date with recent kernel releases and patches;
 despite the noble goal of class compliance, there are extant audio peripherals
 with <a href="http://en.wiktionary.org/wiki/quirk">quirks</a>,
diff --git a/src/devices/devices_toc.cs b/src/devices/devices_toc.cs
index 23d7379..40e74ad 100644
--- a/src/devices/devices_toc.cs
+++ b/src/devices/devices_toc.cs
@@ -45,7 +45,7 @@
               <li><a href="<?cs var:toroot ?>devices/audio/latency_measure.html">Measure</a></li>
               <li><a href="<?cs var:toroot ?>devices/audio/latency_design.html">Design</a></li>
               <li><a href="<?cs var:toroot ?>devices/audio/testing_circuit.html">Light Testing Circuit</a></li>
-              <li><a href="<?cs var:toroot ?>devices/audio/funplug.html">Loopback Audio Dongle</a></li>
+              <li><a href="<?cs var:toroot ?>devices/audio/loopback.html">Loopback Audio Dongle</a></li>
             </ul>
           </li>
           <li><a href="<?cs var:toroot ?>devices/audio/avoiding_pi.html">Priority Inversion</a></li>