diff --git a/doc/html/comparison.html b/doc/html/comparison.html
index b80d3d61..64ca89c2 100644
--- a/doc/html/comparison.html
+++ b/doc/html/comparison.html
@@ -104,10 +104,10 @@
 			<A HREF="index.html">flac</A> of course.
 		</LI>
 		<LI>
-			<A HREF="http://yoyo.cc.monash.edu.au/~phf/bonk">Bonk</A> - An open-source source codec.  No player or library support yet.
+			<A HREF="http://yoyo.cc.monash.edu.au/~pfh/bonk/">Bonk</A> - An open-source source codec.  No player or library support yet.
 		</LI>
 		<LI>
-			<A HREF="http://sourceforge.net/projects/kexis">Kexis</A> - An open-source source codec.  Still in the alpha stage.  No player or library support yet.
+			<A HREF="http://sourceforge.net/projects/kexis">Kexis</A> - An open-source source codec. Development seems to have stopped at the alpha stage.  No player or library support yet.
 		</LI>
 		<LI>
 			<A HREF="http://www-ft.ee.tu-berlin.de/~liebchen/lpac.html">LPAC</A> - A closed source codec.  At least it's available for more than just Windows, but there's only a Winamp plugin.
@@ -125,7 +125,7 @@
 			<A HREF="http://www.jpg.com/products/sound.html">Pegasus-SPS</A> - A closed source, Windows-only codec.
 		</LI>
 		<LI>
-			<A HREF="http://rksoft.virtualave.net/">RKAU</A> - A closed source, Windows-only codec.
+			<A HREF="http://rksoft.virtualave.net/">RKAU</A> - A closed source, Windows-only codec.  No update in over two years.
 		</LI>
 		<LI>
 			<A HREF="http://www.softsound.com/Shorten.html">Shorten</A> - A.J. Robinson's well-known codec; source is available <A HREF="http://rpmfind.net/linux/rpm2html/search.php?query=shorten">here</A>.
@@ -190,10 +190,10 @@
 				YES (<A HREF="http://www.opensource.org/licenses/index.html">OSI</A> approved license)
 			</TD>
 			<TD>
-				YES (<A HREF="http://www.winamp.com/">Winamp</A>, <A HREF="http://www.macamplite.com/addons/plugins.php">MacAmp Lite</A>, <A HREF="http://www.xmms.org/">XMMS</A>, <A HREF="http://www.hut.fi/~hylinen/apollo/Plug-ins.html">Apollo</A>, <A HREF="http://www.dbpoweramp.com/">dBpowerAMP</A>, <A HREF="http://alsaplayer.org/">AlsaPlayer</A>)
+				YES (<A HREF="http://www.xmms.org/">XMMS</A>, <A HREF="http://alsaplayer.org/">AlsaPlayer</A>, <A HREF="http://www.winamp.com/">Winamp</A>, <A HREF="http://www.macamplite.com/addons/plugins.php">MacAmp Lite</A>, <A HREF="http://www.dbpoweramp.com/">dBpowerAMP</A>, <A HREF="http://www.saunalahti.fi/~cse/foobar2000/index.html">Foobar2000</A>, <A HREF="http://www.hut.fi/~hylinen/apollo/Plug-ins.html">Apollo</A>)
 			</TD>
 			<TD>
-				YES (<A HREF="http://www.phatnoise.com/technology/encoding.php">PhatBox</A>, Kenwood MusicKeg, Rio Receiver, Dell Digital Audio Receiver)
+				YES (<A HREF="http://www.phatnoise.com/technology/encoding.php">PhatBox</A>, Kenwood MusicKeg, <A HREF="http://sourceforge.net/projects/rioplay/">Rio Receiver</A>, Dell Digital Audio Receiver, <A HREF="http://file-ext-map.sourceforge.net/">Turtle Beach AudioTron</A>)
 			</TD>
 			<TD>
 				YES
@@ -293,8 +293,8 @@
 			<TD>
 				YES (<A HREF="http://www.opensource.org/licenses/index.html">OSI</A> approved license)
 			</TD>
-			<TD BGCOLOR="#D3D4C5">
-				no
+			<TD>
+				YES (XMMS)
 			</TD>
 			<TD BGCOLOR="#D3D4C5">
 				no
@@ -314,10 +314,13 @@
 		</TR>
 		<TR>
 			<TD ALIGN="RIGHT" BGCOLOR="#F4F4CC">
-				Kexis 0.2.2
+				optimFROG 4.21
+			</TD>
+			<TD BGCOLOR="#D3D4C5">
+				no
 			</TD>
 			<TD>
-				YES (<A HREF="http://www.opensource.org/licenses/index.html">OSI</A> approved license)
+				YES (Winamp, XMMS)
 			</TD>
 			<TD BGCOLOR="#D3D4C5">
 				no
@@ -325,17 +328,14 @@
 			<TD BGCOLOR="#D3D4C5">
 				no
 			</TD>
-			<TD BGCOLOR="#D3D4C5">
-				no
-			</TD>
-			<TD BGCOLOR="#D3D4C5">
-				no
+			<TD>
+				YES
 			</TD>
 			<TD>
 				FREE
 			</TD>
-			<TD>
-				ANY (source)
+			<TD BGCOLOR="#D3D4C5">
+				Windows/Linux
 			</TD>
 		</TR>
 		<TR>
@@ -390,32 +390,6 @@
 				Windows only
 			</TD>
 		</TR>
-		<TR>
-			<TD ALIGN="RIGHT" BGCOLOR="#F4F4CC">
-				optimFROG 4.21
-			</TD>
-			<TD BGCOLOR="#D3D4C5">
-				no
-			</TD>
-			<TD>
-				YES (Winamp, XMMS)
-			</TD>
-			<TD BGCOLOR="#D3D4C5">
-				no
-			</TD>
-			<TD BGCOLOR="#D3D4C5">
-				no
-			</TD>
-			<TD>
-				YES
-			</TD>
-			<TD>
-				FREE
-			</TD>
-			<TD BGCOLOR="#D3D4C5">
-				Windows/Linux
-			</TD>
-		</TR>
 		<TR>
 			<TD ALIGN="RIGHT" BGCOLOR="#F4F4CC">
 				RKAU v1.07
@@ -442,6 +416,32 @@
 				Windows only
 			</TD>
 		</TR>
+		<TR>
+			<TD ALIGN="RIGHT" BGCOLOR="#F4F4CC">
+				Kexis 0.2.2
+			</TD>
+			<TD>
+				YES (<A HREF="http://www.opensource.org/licenses/index.html">OSI</A> approved license)
+			</TD>
+			<TD BGCOLOR="#D3D4C5">
+				no
+			</TD>
+			<TD BGCOLOR="#D3D4C5">
+				no
+			</TD>
+			<TD BGCOLOR="#D3D4C5">
+				no
+			</TD>
+			<TD BGCOLOR="#D3D4C5">
+				no
+			</TD>
+			<TD>
+				FREE
+			</TD>
+			<TD>
+				ANY (source)
+			</TD>
+		</TR>
 		<TR>
 			<TD ALIGN="RIGHT" BGCOLOR="#F4F4CC">
 				WaveZIP v2