final merge down from 1.1.2 maintenance branch (cvs up -j FLAC_RELEASE_1_1_2_MAINTENANCE_BASELINE -j FLAC_RELEASE_1_1_2_MAINTENANCE_BRANCH)
diff --git a/COPYING.LGPL b/COPYING.LGPL
index 9623417..5ab7695 100644
--- a/COPYING.LGPL
+++ b/COPYING.LGPL
@@ -1,13 +1,14 @@
-		  GNU LIBRARY GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
+		  GNU LESSER GENERAL PUBLIC LICENSE
+		       Version 2.1, February 1999
 
- Copyright (C) 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-[This is the first released version of the library GPL.  It is
- numbered 2 because it goes with version 2 of the ordinary GPL.]
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
 
 			    Preamble
 
@@ -16,97 +17,109 @@
 Licenses are intended to guarantee your freedom to share and change
 free software--to make sure the software is free for all its users.
 
-  This license, the Library General Public License, applies to some
-specially designated Free Software Foundation software, and to any
-other libraries whose authors decide to use it.  You can use it for
-your libraries, too.
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
 
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
 
   To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if
-you distribute copies of the library, or if you modify it.
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
 
   For example, if you distribute copies of the library, whether gratis
 or for a fee, you must give the recipients all the rights that we gave
 you.  You must make sure that they, too, receive or can get the source
-code.  If you link a program with the library, you must provide
-complete object files to the recipients so that they can relink them
-with the library, after making changes to the library and recompiling
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
 it.  And you must show them these terms so they know their rights.
 
-  Our method of protecting your rights has two steps: (1) copyright
-the library, and (2) offer you this license which gives you legal
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
 permission to copy, distribute and/or modify the library.
 
-  Also, for each distributor's protection, we want to make certain
-that everyone understands that there is no warranty for this free
-library.  If the library is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original
-version, so that any problems introduced by others will not reflect on
-the original authors' reputations.
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
 
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that companies distributing free
-software will individually obtain patent licenses, thus in effect
-transforming the program into proprietary software.  To prevent this,
-we have made it clear that any patent must be licensed for everyone's
-free use or not licensed at all.
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
 
-  Most GNU software, including some libraries, is covered by the ordinary
-GNU General Public License, which was designed for utility programs.  This
-license, the GNU Library General Public License, applies to certain
-designated libraries.  This license is quite different from the ordinary
-one; be sure to read it in full, and don't assume that anything in it is
-the same as in the ordinary license.
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
 
-  The reason we have a separate public license for some libraries is that
-they blur the distinction we usually make between modifying or adding to a
-program and simply using it.  Linking a program with a library, without
-changing the library, is in some sense simply using the library, and is
-analogous to running a utility program or application program.  However, in
-a textual and legal sense, the linked executable is a combined work, a
-derivative of the original library, and the ordinary General Public License
-treats it as such.
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
 
-  Because of this blurred distinction, using the ordinary General
-Public License for libraries did not effectively promote software
-sharing, because most developers did not use the libraries.  We
-concluded that weaker conditions might promote sharing better.
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
 
-  However, unrestricted linking of non-free programs would deprive the
-users of those programs of all benefit from the free status of the
-libraries themselves.  This Library General Public License is intended to
-permit developers of non-free programs to use free libraries, while
-preserving your freedom as a user of such programs to change the free
-libraries that are incorporated in them.  (We have not seen how to achieve
-this as regards changes in header files, but we have achieved it as regards
-changes in the actual functions of the Library.)  The hope is that this
-will lead to faster development of free libraries.
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
 
   The precise terms and conditions for copying, distribution and
 modification follow.  Pay close attention to the difference between a
 "work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, while the latter only
-works together with the library.
-
-  Note that it is possible for a library to be covered by the ordinary
-General Public License rather than by this special one.
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
 
-		  GNU LIBRARY GENERAL PUBLIC LICENSE
+		  GNU LESSER GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
-  0. This License Agreement applies to any software library which
-contains a notice placed by the copyright holder or other authorized
-party saying it may be distributed under the terms of this Library
-General Public License (also called "this License").  Each licensee is
-addressed as "you".
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
 
   A "library" means a collection of software functions and/or data
 prepared so as to be conveniently linked with application programs
@@ -133,7 +146,7 @@
 on the Library (independent of the use of the Library in a tool for
 writing it).  Whether that is true depends on what the Library does
 and what the program that uses the Library does.
-
+  
   1. You may copy and distribute verbatim copies of the Library's
 complete source code as you receive it, in any medium, provided that
 you conspicuously and appropriately publish on each copy an
@@ -255,7 +268,7 @@
 Any executables containing that work also fall under Section 6,
 whether or not they are linked directly with the Library itself.
 
-  6. As an exception to the Sections above, you may also compile or
+  6. As an exception to the Sections above, you may also combine or
 link a "work that uses the Library" with the Library to produce a
 work containing portions of the Library, and distribute that work
 under terms of your choice, provided that the terms permit
@@ -282,23 +295,31 @@
     Library will not necessarily be able to recompile the application
     to use the modified definitions.)
 
-    b) Accompany the work with a written offer, valid for at
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
     least three years, to give the same user the materials
     specified in Subsection 6a, above, for a charge no more
     than the cost of performing this distribution.
 
-    c) If distribution of the work is made by offering access to copy
+    d) If distribution of the work is made by offering access to copy
     from a designated place, offer equivalent access to copy the above
     specified materials from the same place.
 
-    d) Verify that the user has already received a copy of these
+    e) Verify that the user has already received a copy of these
     materials or that you have already sent this user a copy.
 
   For an executable, the required form of the "work that uses the
 Library" must include any data and utility programs needed for
 reproducing the executable from it.  However, as a special exception,
-the source code distributed need not include anything that is normally
-distributed (in either source or binary form) with the major
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
 components (compiler, kernel, and so on) of the operating system on
 which the executable runs, unless that component itself accompanies
 the executable.
@@ -347,7 +368,7 @@
 original licensor to copy, distribute, link with or modify the Library
 subject to these terms and conditions.  You may not impose any further
 restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
+You are not responsible for enforcing compliance by third parties with
 this License.
 
   11. If, as a consequence of a court judgment or allegation of patent
@@ -390,7 +411,7 @@
 written in the body of this License.
 
   13. The Free Software Foundation may publish revised and/or new
-versions of the Library General Public License from time to time.
+versions of the Lesser General Public License from time to time.
 Such new versions will be similar in spirit to the present version,
 but may differ in detail to address new problems or concerns.
 
@@ -453,18 +474,18 @@
     Copyright (C) <year>  <name of author>
 
     This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
+    modify it under the terms of the GNU Lesser General Public
     License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
+    version 2.1 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
+    Lesser General Public License for more details.
 
-    You should have received a copy of the GNU Library General Public
-    License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -479,3 +500,5 @@
   Ty Coon, President of Vice
 
 That's all there is to it!
+
+
diff --git a/README b/README
index 814a60c..5fd0a6f 100644
--- a/README
+++ b/README
@@ -5,10 +5,10 @@
  * components distributed under difference licenses.  The codec libraries
  * are distributed under Xiph.Org's BSD-like license (see the file
  * COPYING.Xiph in this distribution).  All other programs, libraries, and
- * plugins are distributed under the GPL (see COPYING.GPL).  The documentation
- * is distributed under the Gnu FDL (see COPYING.FDL).  Each file in the
- * FLAC distribution contains at the top the terms under which it may be
- * distributed.
+ * plugins are distributed under the LGPL or GPL (see COPYING.LGPL and
+ * COPYING.GPL).  The documentation is distributed under the Gnu FDL (see
+ * COPYING.FDL).  Each file in the FLAC distribution contains at the top the
+ * terms under which it may be distributed.
  *
  * Since this particular file is relevant to all components of FLAC,
  * it may be distributed under the Xiph.Org license, which is the least
diff --git a/doc/html/changelog.html b/doc/html/changelog.html
index 53d445e..58c6378 100644
--- a/doc/html/changelog.html
+++ b/doc/html/changelog.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Copyright (c)  2004,2005,2006 Josh Coalson -->
+<!-- Copyright (c) 2004,2005,2006  Josh Coalson -->
 <!-- Permission is granted to copy, distribute and/or modify this document -->
 <!-- under the terms of the GNU Free Documentation License, Version 1.1 -->
 <!-- or any later version published by the Free Software Foundation; -->
@@ -543,7 +543,23 @@
 </div>
 
 <div class="copyright">
-	Copyright (c) 2004,2005,2006 Josh Coalson
+	<!-- @@@ oh so hacky -->
+	<table>
+		<tr>
+			<td align="left">
+				Copyright (c) 2004,2005,2006  Josh Coalson
+			</td>
+			<td width="1%" align="right">
+				<a href="http://sourceforge.net"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=13478&amp;type=1" width="88" height="31" border="0" alt="SourceForge.net Logo" /></a>
+			</td>
+			<td width="1%" align="right">
+				<a href="http://www.eff.org/cafe/"><img src="images/cafebug.gif" alt="CAFE Logo" border="0" /></a><br />
+			</td>
+			<td width="1%" align="right">
+				<a href="http://validator.w3.org/check?uri=referer"><img src="http://www.w3.org/Icons/valid-xhtml10" alt="Valid XHTML 1.0!" height="31" width="88" border="0" hspace="0" /></a>
+			</td>
+		</tr>
+	</table>
 </div>
 
 </body>
diff --git a/doc/html/comparison.html b/doc/html/comparison.html
index 39d20bb..3cfab07 100644
--- a/doc/html/comparison.html
+++ b/doc/html/comparison.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Copyright (c)  2000,2001,2002,2003,2004,2005,2006 Josh Coalson -->
+<!-- Copyright (c) 2000,2001,2002,2003,2004,2005,2006  Josh Coalson -->
 <!-- Permission is granted to copy, distribute and/or modify this document -->
 <!-- under the terms of the GNU Free Documentation License, Version 1.1 -->
 <!-- or any later version published by the Free Software Foundation; -->
@@ -56,36 +56,38 @@
 		The purpose of the comparison page is not only to show how compression ratios and encoding/decoding times using the flac reference encoder compare to other lossless encoders, but also to compare features (for example, some coders archive only and files must be uncompressed completely before playback can start).  Keep a few things in mind:
 		<ul>
 			<li>
-				As far as I know, only two of the lossless encoders out there (FLAC and WavPack) are both actively developed and truly free (source code for Shorten and Monkey's Audio is available but the licenses are more restrictive).  Most others give out free binaries, but without access to the source, you are leaving your data to the whim of the maintainer for eternity; you have no way to port the program to another OS or fix it if it breaks.  This can be a serious drawback unless the format has world-class clout (like MP3).
+				As far as I know, only two of the lossless encoders out there (FLAC and WavPack) are both actively developed and truly free (source code for Shorten and Monkey's Audio is available but the licenses are more restrictive).  Most others give out free binaries, but without access to the source or the format specification, you are leaving your data to the whim of the maintainer for eternity; you have no alternative software to use, and no way to port the program to another OS or fix it if it breaks.
 			</li>
 			<li>
-				The compression ratios and times for flac are representative only of the reference encoder.  They are not indicative of the limits of all FLAC encoders or the FLAC format itself since the format is open and extensible, and anyone is free to write a better FLAC encoder.  And it is almost certain that the reference encoder itself will improve.
-			</li>
-			<li>
-				Since FLAC supports streaming, it is at a slight disadvantage to the formats that don't because they don't have the extra overhead of all those frame headers.
+				The compression ratios and times for flac are representative only of the reference encoder.  They are not indicative of the limits of all FLAC encoders or the FLAC format itself since the format is open and extensible, and anyone is free to write a better FLAC encoder.
 			</li>
 		</ul>
 		I make an effort to keep this information as accurate as possible, but if any of the data is wrong, <a href="mailto:jcoalson@users.sourceforge.net">let me know</a> and I'll correct it.  For another comparison (with graphs) of lossless codecs, see <a href="http://web.inter.nl.net/users/hvdh/lossless/lossless.htm">here</a>.
 		<br /><br />
+		Note: the comparison tables are getting a little stale for some of the other encoders; for some alternate comparisons and other lossless information see these links:
+		<ul>
+			<li><a href="http://web.inter.nl.net/users/hvdh/lossless/lossless.htm">Hans Heijden's</a> lossless comparison</li>
+			<li><a href="http://wiki.hydrogenaudio.org/index.php?title=Lossless_comparison">Roberto Amorim's</a> lossless comparison on Hydrogenaudio</li>
+			<li><a href="http://www.hydrogenaudio.org/forums/index.php?showtopic=33226">"Which is the best lossless codec?"</a> thread on Hydrogenaudio</li>
+			<li><a href="http://www.losslessaudioblog.com/">Lossless Audio Blog</a></li>
+		</ul>
+		<br /><br />
 		Reviewed encoders (besides flac of course):
 		<ul>
 			<li>
-				Apple Lossless - A new proprietary codec by Apple.  Not much is known about it.
+				Apple Lossless - A relatively new proprietary codec by Apple.
 			</li>
 			<li>
 				<a href="http://www.logarithmic.net/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. Development seems to have stopped at the alpha stage.  No player or library support yet.
-			</li>
-			<li>
 				<a href="http://www.lossless-audio.com">La</a> - A closed source symmetric adaptive codec, with Windows and Linux console binaries.  Current king of compression ratios but extremely slow.
 			</li>
 			<li>
-				<a href="http://www.nue.tu-berlin.de/wer/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.
+				<a href="http://www.nue.tu-berlin.de/wer/liebchen/lpac.html">LPAC</a> - A closed source codec with little software support.
 			</li>
 			<li>
-				<a href="http://www.monkeysaudio.com/">Monkey's Audio</a> - A symmetric adaptive codec with good compression.  Source is available under a non-OSI license.  There are two versions available now, one by the original author Matt Ashland and one by Frank Klemm.  The one tested here is from the original author.
+				<a href="http://www.monkeysaudio.com/">Monkey's Audio</a> - A symmetric adaptive codec with good compression.  Source is available under a non-OSI license.
 			</li>
 			<li>
 				Ogg Squish - An open source source codec that is no longer maintained.  The version I tested, 0.98, was the latest I could find.  I don't have Windows timing results but it is among the 'fast' coders, based on UNIX tests.
@@ -94,28 +96,13 @@
 				<a href="http://losslessaudiocompression.com/">optimFROG</a> - A closed source, Windows/Linux codec, with Winamp and XMMS plugins.  Slow but high compression ratios.
 			</li>
 			<li>
-				<a href="http://www.jpg.com/products/sound.html">Pegasus-SPS</a> - A closed source, Windows-only codec.
-			</li>
-			<li>
-				<a href="http://www.msoftware.co.nz/">RKAU</a> - A closed source, Windows-only codec.  No update in over two years.
+				<a href="http://www.msoftware.co.nz/">RKAU</a> - A closed source, Windows-only codec.
 			</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>.
 			</li>
 			<li>
-				WaveZIP - A closed source, Windows-only archiver.  Uses the <a href="http://members.aol.com/_ht_a/sndspace/index.html">MUSICompress</a>[tm] engine which supposedly has a patent.  I used to have a link to the company that makes WaveZIP (GadgetLabs) but apparently they have gone out of business (maybe for trying to sell something that should cost nothing).
-			</li>
-			<li>
-				<a href="http://www.wavpack.com/">WavPack</a> - An open-source, (currently) Windows-based codec, released under the BSD license.  WavPack has a very good tradeoff between compressed size and compression speed.
-			</li>
-		</ul>
-		Encoders I couldn't get a copy of:
-		<ul>
-			<li>
-				AudioPak
-			</li>
-			<li>
-				WavARC
+				<a href="http://www.wavpack.com/">WavPack</a> - An open-source codec, released under the BSD license.  WavPack has a very good tradeoff between compressed size and compression speed.
 			</li>
 		</ul>
 		If you take maximum compression ratio and speed out of the picture (as you will see later, most coders exhibit similar performance), here is a subjective sort based on overall "usefulness".  As far as features go, having source code gives you the most freedom since you can add anything you need that is missing; besides, open source projects tend to get better faster than closed source ones.  A close second (depending on the user) would be OS support or plugin support.
@@ -130,19 +117,19 @@
 					<font size="+1"><b>Source Available?</b></font>
 				</td>
 				<td bgcolor="#F4F4CC">
-					<font size="+1"><b>Plugins Available?</b></font>
+					<font size="+1"><b>Player Support?</b></font>
 				</td>
 				<td bgcolor="#F4F4CC">
 					<font size="+1"><b>Hardware Support?</b></font>
 				</td>
 				<td bgcolor="#F4F4CC">
-					<font size="+1"><b>Streamable?</b></font>
+					<font size="+1"><b>Can Stream?</b></font>
 				</td>
 				<td bgcolor="#F4F4CC">
-					<font size="+1"><b>Seekable?</b></font>
+					<font size="+1"><b>Can Seek?</b></font>
 				</td>
 				<td bgcolor="#F4F4CC">
-					<font size="+1"><b>Cost</b></font>
+					<font size="+1"><b>License Cost</b></font>
 				</td>
 				<td bgcolor="#F4F4CC">
 					<font size="+1"><b>OS support</b></font>
@@ -150,16 +137,16 @@
 			</tr>
 			<tr>
 				<td align="right" bgcolor="#F4F4CC">
-					flac v1.1.1
+					flac v1.1.3
 				</td>
 				<td>
 					YES (<a href="http://www.opensource.org/licenses/index.html">OSI</a> approved license)
 				</td>
 				<td>
-					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.quinnware.com/">QCD</a>, <a href="http://www.hut.fi/~hylinen/apollo/Plug-ins.html">Apollo</a>, more)
+					YES (<a href="http://www.xmms.org/">XMMS</a>, <a href="http://alsaplayer.org/">AlsaPlayer</a>, <a href="http://music.yahoo.com/musicengine/">Y! Music Engine</a>, <a href="http://www.winamp.com/">Winamp</a>, <a href="http://arcticlounge.com/maltx/">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.quinnware.com/">QCD</a>, <a href="http://www.hut.fi/~hylinen/apollo/Plug-ins.html">Apollo</a>, <a href="download.html#extras">many more</a>)
 				</td>
 				<td>
-					YES (<a href="http://www.request.com/us/">ARQ</a>, <a href="http://www.phatnoise.com/technology/encoding.php">PhatBox</a>, Kenwood MusicKeg, <a href="http://www.digitalnetworksna.com/shop/_templates/item_main_Rio.asp?model=220&amp;cat=53">Rio Karma</a>, <a href="http://sourceforge.net/projects/rioplay/">Rio Receiver</a>, Dell Digital Audio Receiver, <a href="http://www.rokulabs.com/">Roku Soundbridge</a>, <a href="http://www.slimdevices.com/">Squeezebox</a>, <a href="http://file-ext-map.sourceforge.net/">AudioTron</a>)
+					YES (<a href="http://www.slimdevices.com/">Squeezebox</a>, <a href="http://www.sonos.com/">Sonos</a>, <a href="http://www.phatnoise.com/technology/encoding.php">PhatBox</a>, Kenwood MusicKeg, <a href="http://www.cowonamerica.com/products/">iAudio</a>, <a href="links.html#hardware">dozens more</a>)
 				</td>
 				<td>
 					YES
@@ -168,7 +155,7 @@
 					YES
 				</td>
 				<td>
-					FREE
+					NONE
 				</td>
 				<td>
 					Linux, Windows, Mac OS X, *BSD, Solaris, OS/2, BeOS, others
@@ -176,25 +163,51 @@
 			</tr>
 			<tr>
 				<td align="right" bgcolor="#F4F4CC">
+					WavPack v4.31
+				</td>
+				<td>
+					YES (<a href="http://www.opensource.org/licenses/index.html">OSI</a> approved license)
+				</td>
+				<td>
+					YES (Winamp, foobar2000, dBpowerAMP, <a href="http://wiki.hydrogenaudio.org/index.php?title=WavPack#Players">more</a>)
+				</td>
+				<td bgcolor="#D4D4C0">
+					YES (some portables via <a href="http://www.rockbox.org/">Rockbox</a> firmware replacement)
+				</td>
+				<td>
+					YES
+				</td>
+				<td>
+					YES
+				</td>
+				<td>
+					NONE
+				</td>
+				<td>
+					Linux, Windows, Mac OS X
+				</td>
+			</tr>
+			<tr>
+				<td align="right" bgcolor="#F4F4CC">
 					Shorten v3.2
 				</td>
 				<td>
 					YES (non-<a href="http://www.opensource.org/licenses/index.html">OSI</a> license)
 				</td>
-				<td>
+				<td bgcolor="#D4D4C0">
 					YES (Winamp, XMMS)
 				</td>
-				<td bgcolor="#D3D4C5">
-					no
+				<td bgcolor="#D4D4C0">
+					YES (some portables via <a href="http://www.rockbox.org/">Rockbox</a> firmware replacement)
 				</td>
-				<td bgcolor="#D3D4C5">
+				<td bgcolor="#BCBCAC">
 					no
 				</td>
 				<td>
 					YES (v3 only)
 				</td>
-				<td>
-					FREE
+				<td bgcolor="#BCBCAC">
+					non-<br>commercial only
 				</td>
 				<td>
 					Linux, Windows, Mac OS 9, Mac OS X, *BSD, Solaris, others
@@ -202,53 +215,27 @@
 			</tr>
 			<tr>
 				<td align="right" bgcolor="#F4F4CC">
-					WavPack v3.97a
-				</td>
-				<td>
-					YES (<a href="http://www.opensource.org/licenses/index.html">OSI</a> approved license)
-				</td>
-				<td>
-					YES (Winamp only)
-				</td>
-				<td bgcolor="#D3D4C5">
-					no
-				</td>
-				<td bgcolor="#D3D4C5">
-					no
-				</td>
-				<td>
-					YES
-				</td>
-				<td>
-					FREE
-				</td>
-				<td bgcolor="#D3D4C5">
-					Windows
-				</td>
-			</tr>
-			<tr>
-				<td align="right" bgcolor="#F4F4CC">
 					Monkey's Audio v3.99
 				</td>
-				<td>
+				<td bgcolor="#D4D4C0">
 					YES (non-<a href="http://www.opensource.org/licenses/index.html">OSI</a> license)
 				</td>
 				<td>
 					YES (Winamp, MediaJukebox, dBpowerAMP, more)
 				</td>
-				<td bgcolor="#D3D4C5">
+				<td bgcolor="#BCBCAC">
 					no
 				</td>
-				<td bgcolor="#D3D4C5">
+				<td bgcolor="#BCBCAC">
 					no
 				</td>
 				<td>
 					YES
 				</td>
-				<td>
-					FREE
+				<td bgcolor="#BCBCAC">
+					?
 				</td>
-				<td bgcolor="#D3D4C5">
+				<td bgcolor="#D4D4C0">
 					Windows, Linux console source
 				</td>
 			</tr>
@@ -256,14 +243,14 @@
 				<td align="right" bgcolor="#F4F4CC">
 					Apple Lossless
 				</td>
-				<td bgcolor="#D3D4C5">
+				<td bgcolor="#BCBCAC">
 					no
 				</td>
-				<td>
+				<td bgcolor="#D4D4C0">
 					YES (<a href="http://www.apple.com/itunes/">iTunes</a>)
 				</td>
-				<td>
-					YES (<a href="http://www.apple.com/ipod/">iPod</a>)
+				<td bgcolor="#D4D4C0">
+					YES (<a href="http://www.apple.com/ipod/">iPod</a> only)
 				</td>
 				<td>
 					YES
@@ -271,10 +258,10 @@
 				<td>
 					YES
 				</td>
-				<td>
-					FREE
+				<td bgcolor="#BCBCAC">
+					unavailable
 				</td>
-				<td bgcolor="#D3D4C5">
+				<td bgcolor="#BCBCAC">
 					Windows, Mac OS X
 				</td>
 			</tr>
@@ -285,10 +272,10 @@
 				<td>
 					YES (<a href="http://www.opensource.org/licenses/index.html">OSI</a> approved license)
 				</td>
-				<td bgcolor="#D3D4C5">
+				<td bgcolor="#BCBCAC">
 					no (?)
 				</td>
-				<td bgcolor="#D3D4C5">
+				<td bgcolor="#BCBCAC">
 					no
 				</td>
 				<td>
@@ -298,7 +285,7 @@
 					YES
 				</td>
 				<td>
-					FREE
+					NONE
 				</td>
 				<td>
 					Linux, Windows, other UNIX
@@ -311,20 +298,20 @@
 				<td>
 					YES (<a href="http://www.opensource.org/licenses/index.html">OSI</a> approved license)
 				</td>
-				<td>
+				<td bgcolor="#D4D4C0">
 					YES (XMMS)
 				</td>
-				<td bgcolor="#D3D4C5">
+				<td bgcolor="#BCBCAC">
 					no
 				</td>
-				<td bgcolor="#D3D4C5">
+				<td bgcolor="#BCBCAC">
 					no
 				</td>
-				<td bgcolor="#D3D4C5">
+				<td bgcolor="#BCBCAC">
 					no
 				</td>
-				<td>
-					FREE
+				<td bgcolor="#BCBCAC">
+					?
 				</td>
 				<td>
 					Linux, Windows, other UNIX
@@ -334,25 +321,25 @@
 				<td align="right" bgcolor="#F4F4CC">
 					La 0.3c
 				</td>
-				<td bgcolor="#D3D4C5">
+				<td bgcolor="#BCBCAC">
 					no
 				</td>
-				<td>
+				<td bgcolor="#D4D4C0">
 					YES (Winamp, XMMS)
 				</td>
-				<td bgcolor="#D3D4C5">
+				<td bgcolor="#BCBCAC">
 					no
 				</td>
-				<td bgcolor="#D3D4C5">
+				<td bgcolor="#BCBCAC">
 					no
 				</td>
 				<td>
 					YES
 				</td>
-				<td>
-					FREE
+				<td bgcolor="#BCBCAC">
+					?
 				</td>
-				<td bgcolor="#D3D4C5">
+				<td bgcolor="#BCBCAC">
 					Windows, Linux
 				</td>
 			</tr>
@@ -360,25 +347,25 @@
 				<td align="right" bgcolor="#F4F4CC">
 					optimFROG 4.21
 				</td>
-				<td bgcolor="#D3D4C5">
+				<td bgcolor="#BCBCAC">
 					no
 				</td>
-				<td>
+				<td bgcolor="#D4D4C0">
 					YES (Winamp, XMMS)
 				</td>
-				<td bgcolor="#D3D4C5">
+				<td bgcolor="#BCBCAC">
 					no
 				</td>
-				<td bgcolor="#D3D4C5">
+				<td bgcolor="#BCBCAC">
 					no
 				</td>
 				<td>
 					YES
 				</td>
-				<td>
-					FREE
+				<td bgcolor="#BCBCAC">
+					?
 				</td>
-				<td bgcolor="#D3D4C5">
+				<td bgcolor="#BCBCAC">
 					Windows, Linux
 				</td>
 			</tr>
@@ -386,25 +373,25 @@
 				<td align="right" bgcolor="#F4F4CC">
 					LPAC v1.31 (codec 3.0)
 				</td>
-				<td bgcolor="#D3D4C5">
+				<td bgcolor="#BCBCAC">
 					no
 				</td>
-				<td>
+				<td bgcolor="#D4D4C0">
 					YES (Winamp only)
 				</td>
-				<td bgcolor="#D3D4C5">
+				<td bgcolor="#BCBCAC">
 					no
 				</td>
-				<td bgcolor="#D3D4C5">
+				<td bgcolor="#BCBCAC">
 					no?
 				</td>
 				<td>
 					YES
 				</td>
-				<td>
-					FREE
+				<td bgcolor="#BCBCAC">
+					?
 				</td>
-				<td bgcolor="#D3D4C5">
+				<td bgcolor="#BCBCAC">
 					Windows, Linux console, Solaris console
 				</td>
 			</tr>
@@ -412,103 +399,25 @@
 				<td align="right" bgcolor="#F4F4CC">
 					RKAU v1.07
 				</td>
-				<td bgcolor="#D3D4C5">
+				<td bgcolor="#BCBCAC">
 					no
 				</td>
-				<td>
+				<td bgcolor="#D4D4C0">
 					YES (Winamp only)
 				</td>
-				<td bgcolor="#D3D4C5">
+				<td bgcolor="#BCBCAC">
 					no
 				</td>
-				<td bgcolor="#D3D4C5">
+				<td bgcolor="#BCBCAC">
 					no
 				</td>
 				<td>
 					YES
 				</td>
-				<td>
-					FREE
+				<td bgcolor="#BCBCAC">
+					?
 				</td>
-				<td bgcolor="#D3D4C5">
-					Windows
-				</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>
-					Linux, Windows, other UNIX
-				</td>
-			</tr>
-			<tr>
-				<td align="right" bgcolor="#F4F4CC">
-					WaveZIP v2
-				</td>
-				<td bgcolor="#D3D4C5">
-					no
-				</td>
-				<td bgcolor="#D3D4C5">
-					no
-				</td>
-				<td bgcolor="#D3D4C5">
-					no
-				</td>
-				<td bgcolor="#D3D4C5">
-					no
-				</td>
-				<td bgcolor="#D3D4C5">
-					no
-				</td>
-				<td>
-					FREE (24-bit costs $)
-				</td>
-				<td bgcolor="#D3D4C5">
-					Windows
-				</td>
-			</tr>
-			<tr>
-				<td align="right" bgcolor="#F4F4CC">
-					Pegasus-SPS
-				</td>
-				<td bgcolor="#D3D4C5">
-					no
-				</td>
-				<td bgcolor="#D3D4C5">
-					no
-				</td>
-				<td bgcolor="#D3D4C5">
-					no
-				</td>
-				<td bgcolor="#D3D4C5">
-					no
-				</td>
-				<td bgcolor="#D3D4C5">
-					no
-				</td>
-				<td bgcolor="#D3D4C5">
-					$39 (free trial)
-				</td>
-				<td bgcolor="#D3D4C5">
+				<td bgcolor="#BCBCAC">
 					Windows
 				</td>
 			</tr>
@@ -556,25 +465,22 @@
 					<font size="+1"><b>Average<br />compression<br />ratio</b></font>
 				</td>
 			</tr>
-			<!-- bgcolor="#D3D4C5" -->
+			<!-- bgcolor="#D4D4C0" -->
 			<tr><td>La 0.3c</td><td>151:13.16</td><td>145:49.78</td><td>375.76 MB</td><td>0.4814</td><td>0.4986</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Monkey's Audio 3.99 (high)</td><td>15:45.41</td><td>16:48.03</td><td>389.83 MB</td><td>0.4994</td><td>0.5153</td></tr>
+			<tr bgcolor="#D4D4C0"><td>Monkey's Audio 3.99 (high)</td><td>15:45.41</td><td>16:48.03</td><td>389.83 MB</td><td>0.4994</td><td>0.5153</td></tr>
 			<tr><td>optimFROG 4.21 (mode 0 @ 4x)</td><td>16:34.96</td><td>17:57.28</td><td>394.69 MB</td><td>0.5056</td><td>0.5223</td></tr>
-			<tr bgcolor="#D3D4C5"><td>RKAU 1.07 (fast)</td><td>26:35.34</td><td>20:13.22</td><td>399.25 MB</td><td>0.5115</td><td>0.5262</td></tr>
-			<tr><td>WavPack 3.97a (high)</td><td>13:32.02</td><td>14:39.12</td><td>399.60 MB</td><td>0.5119</td><td>0.5278</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Monkey's Audio 3.99 (fast)</td><td>10:32.11</td><td>11:49.46</td><td>400.57 MB</td><td>0.5132</td><td>0.5311</td></tr>
+			<tr bgcolor="#D4D4C0"><td>WavPack 4.31 (high)</td><td>14:55.78</td><td>11:39.65</td><td>398.27 MB</td><td>0.5102</td><td>0.5242</td></tr>
+			<tr><td>RKAU 1.07 (fast)</td><td>26:35.34</td><td>20:13.22</td><td>399.25 MB</td><td>0.5115</td><td>0.5262</td></tr>
+			<tr bgcolor="#D4D4C0"><td>Monkey's Audio 3.99 (fast)</td><td>10:32.11</td><td>11:49.46</td><td>400.57 MB</td><td>0.5132</td><td>0.5311</td></tr>
 			<tr><td>LPAC 1.40 (-r, medium)</td><td>18:52.79</td><td>10:43.32</td><td>403.52 MB</td><td>0.5170</td><td>0.5319</td></tr>
-			<tr bgcolor="#D3D4C5"><td>WavPack 3.97a (normal)</td><td>6:50.12</td><td>8:13.41</td><td>409.33 MB</td><td>0.5244</td><td>0.5424</td></tr>
-			<tr bgcolor="#FFFFFF"><td>flac 1.1.1 (-5, default)</td><td>12:54.19</td><td>7:08.80</td><td>413.46 MB</td><td>0.5297</td><td>0.5459</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Apple Lossless</td><td>19:53.27</td><td>10:01.86</td><td>414.45 MB</td><td>0.5310</td><td>0.5496</td></tr>
-			<tr><td>Bonk 0.5</td><td>36:56.36</td><td>27:09.35</td><td>418.65 MB</td><td>0.5364</td><td>0.5543</td></tr>
-			<tr bgcolor="#D3D4C5"><td>flac 1.1.1 (-3)</td><td>9:51.58</td><td>7:00.92</td><td>419.29 MB</td><td>0.5372</td><td>0.5544</td></tr>
+			<tr bgcolor="#D4D4C0"><td>WavPack 4.31 (normal)</td><td>10:18.41</td><td>7:57.83</td><td>408.15 MB</td><td>0.5229</td><td>0.5388</td></tr>
+			<tr bgcolor="#FFFFFF"><td>flac 1.1.3 (-5, default)</td><td>13:27.55</td><td>7:04.99</td><td>409.68 MB</td><td>0.5248</td><td>0.5414</td></tr>
+			<tr bgcolor="#D4D4C0"><td>Apple Lossless</td><td>19:53.27</td><td>10:01.86</td><td>414.45 MB</td><td>0.5310</td><td>0.5496</td></tr>
+			<tr><td>flac 1.1.3 (-3)</td><td>10:05.45</td><td>6:51.49</td><td>415.28 MB</td><td>0.5320</td><td>0.5497</td></tr>
+			<tr bgcolor="#D4D4C0"><td>Bonk 0.5</td><td>36:56.36</td><td>27:09.35</td><td>418.65 MB</td><td>0.5364</td><td>0.5543</td></tr>
 			<tr><td>Ogg Squish 0.98</td><td>?</td><td>?</td><td>431.08 MB</td><td>0.5522</td><td>0.5714</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Shorten 3.2a (-p0 -b256, default)</td><td>9:44.48</td><td>6:31.74</td><td>433.56 MB</td><td>0.5555</td><td>0.5729</td></tr>
-			<tr><td>Kexis 0.2.2</td><td>17:49.06</td><td>14:53.90</td><td>434.33 MB</td><td>0.5564</td><td>0.5750</td></tr>
-			<tr bgcolor="#D3D4C5"><td>WavPack 3.97a (fast)</td><td>5:20.17</td><td>5:12.38</td><td>441.88 MB</td><td>0.5661</td><td>0.5857</td></tr>
-			<tr><td>WaveZIP</td><td>8:41.72</td><td>?</td><td>452.95 MB</td><td>0.5802</td><td>0.5986</td></tr>
-			<tr bgcolor="#D3D4C5"><td>RIFF WAVE</td><td>77:19.89</td><td>77:19.89</td><td>780.56 MB</td><td>1.0000</td><td>1.0000</td></tr>
+			<tr bgcolor="#D4D4C0"><td>Shorten 3.2a (-p0 -b256, default)</td><td>9:44.48</td><td>6:31.74</td><td>433.56 MB</td><td>0.5555</td><td>0.5729</td></tr>
+			<tr><td>RIFF WAVE</td><td>77:19.89</td><td>77:19.89</td><td>780.56 MB</td><td>1.0000</td><td>1.0000</td></tr>
 		</table>
 		</td></tr></table>
 		<br />
@@ -604,49 +510,50 @@
 					<font size="+1"><b>Average<br />compression<br />ratio</b></font>
 				</td>
 			</tr>
-			<!-- bgcolor="#D3D4C5" -->
+			<!-- bgcolor="#D4D4C0" -->
 			<tr><td>La 0.3c</td><td>151:13.16</td><td>145:49.78</td><td>375.76 MB</td><td>0.4814</td><td>0.4986</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Monkey's Audio 3.99 (insane)</td><td>130:45.33</td><td>136:47.14</td><td>381.79 MB</td><td>0.4891</td><td>0.5065</td></tr>
+			<tr bgcolor="#D4D4C0"><td>Monkey's Audio 3.99 (insane)</td><td>130:45.33</td><td>136:47.14</td><td>381.79 MB</td><td>0.4891</td><td>0.5065</td></tr>
 			<tr><td>Monkey's Audio 3.99 (extra high)</td><td>28:41.96</td><td>30:05.38</td><td>384.55 MB</td><td>0.4927</td><td>0.5087</td></tr>
-			<tr bgcolor="#D3D4C5"><td>optimFROG 4.21 (mode 4 @ 2x)</td><td>183:05.29</td><td>184:13.42</td><td>386.13 MB</td><td>0.4947</td><td>0.5105</td></tr>
+			<tr bgcolor="#D4D4C0"><td>optimFROG 4.21 (mode 4 @ 2x)</td><td>183:05.29</td><td>184:13.42</td><td>386.13 MB</td><td>0.4947</td><td>0.5105</td></tr>
 			<tr><td>optimFROG 4.21 (mode 4 @ 1x)</td><td>338:34.96</td><td>339:23.24</td><td>386.22 MB</td><td>0.4948</td><td>0.5105</td></tr>
-			<tr bgcolor="#D3D4C5"><td>optimFROG 4.21 (mode 4 @ 4x)</td><td>105:15.85</td><td>106:36.23</td><td>386.21 MB</td><td>0.4948</td><td>0.5107</td></tr>
+			<tr bgcolor="#D4D4C0"><td>optimFROG 4.21 (mode 4 @ 4x)</td><td>105:15.85</td><td>106:36.23</td><td>386.21 MB</td><td>0.4948</td><td>0.5107</td></tr>
 			<tr><td>optimFROG 4.21 (mode 3 @ 2x)</td><td>92:48.79</td><td>93:49.75</td><td>386.52 MB</td><td>0.4952</td><td>0.5110</td></tr>
-			<tr bgcolor="#D3D4C5"><td>optimFROG 4.21 (mode 3 @ 1x)</td><td>161:51.00</td><td>162:10.62</td><td>386.55 MB</td><td>0.4952</td><td>0.5110</td></tr>
+			<tr bgcolor="#D4D4C0"><td>optimFROG 4.21 (mode 3 @ 1x)</td><td>161:51.00</td><td>162:10.62</td><td>386.55 MB</td><td>0.4952</td><td>0.5110</td></tr>
 			<tr><td>optimFROG 4.21 (mode 3 @ 4x)</td><td>58:18.40</td><td>59:30.51</td><td>386.71 MB</td><td>0.4954</td><td>0.5114</td></tr>
-			<tr bgcolor="#D3D4C5"><td>optimFROG 4.21 (mode 2 @ 1x)</td><td>68:22.58</td><td>69:29.50</td><td>387.71 MB</td><td>0.4967</td><td>0.5128</td></tr>
+			<tr bgcolor="#D4D4C0"><td>optimFROG 4.21 (mode 2 @ 1x)</td><td>68:22.58</td><td>69:29.50</td><td>387.71 MB</td><td>0.4967</td><td>0.5128</td></tr>
 			<tr><td>optimFROG 4.21 (mode 2 @ 2x)</td><td>44:17.55</td><td>45:31.33</td><td>387.72 MB</td><td>0.4967</td><td>0.5129</td></tr>
-			<tr bgcolor="#D3D4C5"><td>optimFROG 4.21 (mode 2 @ 4x)</td><td>32:16.85</td><td>33:30.92</td><td>387.93 MB</td><td>0.4970</td><td>0.5133</td></tr>
+			<tr bgcolor="#D4D4C0"><td>optimFROG 4.21 (mode 2 @ 4x)</td><td>32:16.85</td><td>33:30.92</td><td>387.93 MB</td><td>0.4970</td><td>0.5133</td></tr>
 			<tr><td>optimFROG 4.21 (mode 1 @ 1x)</td><td>43:00.91</td><td>44:13.07</td><td>388.71 MB</td><td>0.4980</td><td>0.5146</td></tr>
-			<tr bgcolor="#D3D4C5"><td>optimFROG 4.21 (mode 1 @ 2x)</td><td>30:35.00</td><td>31:50.50</td><td>388.81 MB</td><td>0.4981</td><td>0.5147</td></tr>
+			<tr bgcolor="#D4D4C0"><td>optimFROG 4.21 (mode 1 @ 2x)</td><td>30:35.00</td><td>31:50.50</td><td>388.81 MB</td><td>0.4981</td><td>0.5147</td></tr>
 			<tr><td>optimFROG 4.21 (mode 1 @ 4x)</td><td>24:19.58</td><td>25:37.44</td><td>389.04 MB</td><td>0.4984</td><td>0.5151</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Monkey's Audio 3.99 (high)</td><td>15:45.41</td><td>16:48.03</td><td>389.83 MB</td><td>0.4994</td><td>0.5153</td></tr>
+			<tr bgcolor="#D4D4C0"><td>Monkey's Audio 3.99 (high)</td><td>15:45.41</td><td>16:48.03</td><td>389.83 MB</td><td>0.4994</td><td>0.5153</td></tr>
 			<tr><td>Monkey's Audio 3.99 (normal)</td><td>13:27.96</td><td>14:31.90</td><td>393.17 MB</td><td>0.5037</td><td>0.5197</td></tr>
-			<tr bgcolor="#D3D4C5"><td>optimFROG 4.21 (mode 0 @ 1x)</td><td>20:51.21</td><td>22:08.44</td><td>394.35 MB</td><td>0.5052</td><td>0.5218</td></tr>
-			<tr><td>optimFROG 4.21 (mode 0 @ 2x)</td><td>17:59.86</td><td>19:20.53</td><td>394.48 MB</td><td>0.5054</td><td>0.5220</td></tr>
-			<tr bgcolor="#D3D4C5"><td>optimFROG 4.21 (mode 0 @ 4x)</td><td>16:34.96</td><td>17:57.28</td><td>394.69 MB</td><td>0.5056</td><td>0.5223</td></tr>
-			<tr><td>RKAU 1.07 (normal)</td><td>53:46.74</td><td>23:31.10</td><td>395.71 MB</td><td>0.5070</td><td>0.5229</td></tr>
-			<tr bgcolor="#D3D4C5"><td>RKAU 1.07 (high)</td><td>136:56.62</td><td>27:55.98</td><td>395.89 MB</td><td>0.5072</td><td>0.5235</td></tr>
+			<tr bgcolor="#D4D4C0"><td>WavPack 4.31 (high -x)</td><td>314:59.98</td><td>11:17.14</td><td>396.22 MB</td><td>0.5076</td><td>0.5214</td></tr>
+			<tr><td>optimFROG 4.21 (mode 0 @ 1x)</td><td>20:51.21</td><td>22:08.44</td><td>394.35 MB</td><td>0.5052</td><td>0.5218</td></tr>
+			<tr bgcolor="#D4D4C0"><td>optimFROG 4.21 (mode 0 @ 2x)</td><td>17:59.86</td><td>19:20.53</td><td>394.48 MB</td><td>0.5054</td><td>0.5220</td></tr>
+			<tr><td>optimFROG 4.21 (mode 0 @ 4x)</td><td>16:34.96</td><td>17:57.28</td><td>394.69 MB</td><td>0.5056</td><td>0.5223</td></tr>
+			<tr bgcolor="#D4D4C0"><td>RKAU 1.07 (normal)</td><td>53:46.74</td><td>23:31.10</td><td>395.71 MB</td><td>0.5070</td><td>0.5229</td></tr>
+			<tr><td>RKAU 1.07 (high)</td><td>136:56.62</td><td>27:55.98</td><td>395.89 MB</td><td>0.5072</td><td>0.5235</td></tr>
+			<tr bgcolor="#D4D4C0"><td>WavPack 4.31 (high)</td><td>14:55.78</td><td>11:39.65</td><td>398.27 MB</td><td>0.5102</td><td>0.5242</td></tr>
 			<tr><td>RKAU 1.07 (fast)</td><td>26:35.34</td><td>20:13.22</td><td>399.25 MB</td><td>0.5115</td><td>0.5262</td></tr>
-			<tr bgcolor="#D3D4C5"><td>WavPack 3.97a (high)</td><td>13:32.02</td><td>14:39.12</td><td>399.60 MB</td><td>0.5119</td><td>0.5278</td></tr>
+			<tr bgcolor="#D4D4C0"><td>WavPack 4.31 (normal -x)</td><td>123:46.47</td><td>7:48.09</td><td>401.54 MB</td><td>0.5144</td><td>0.5297</td></tr>
 			<tr><td>Monkey's Audio 3.99 (fast)</td><td>10:32.11</td><td>11:49.46</td><td>400.57 MB</td><td>0.5132</td><td>0.5311</td></tr>
-			<tr bgcolor="#D3D4C5"><td>LPAC 1.40 (-r, medium)</td><td>18:52.79</td><td>10:43.32</td><td>403.52 MB</td><td>0.5170</td><td>0.5319</td></tr>
+			<tr bgcolor="#D4D4C0"><td>LPAC 1.40 (-r, medium)</td><td>18:52.79</td><td>10:43.32</td><td>403.52 MB</td><td>0.5170</td><td>0.5319</td></tr>
 			<tr><td>LPAC 1.40 (-r, extra high)</td><td>30:30.93</td><td>12:20.26</td><td>404.08 MB</td><td>0.5177</td><td>0.5322</td></tr>
-			<tr bgcolor="#D3D4C5"><td>LPAC 1.40 (-r, high)</td><td>24:56.56</td><td>11:51.64</td><td>404.03 MB</td><td>0.5176</td><td>0.5323</td></tr>
-			<tr><td>WavPack 3.97a (normal)</td><td>6:50.12</td><td>8:13.41</td><td>409.33 MB</td><td>0.5244</td><td>0.5424</td></tr>
-			<tr bgcolor="#D3D4C5"><td>flac 1.1.1 (-8)</td><td>55:02.38</td><td>7:07.59</td><td>411.88 MB</td><td>0.5277</td><td>0.5437</td></tr>
-			<tr bgcolor="#FFFFFF"><td>flac 1.1.1 (-5, default)</td><td>12:54.19</td><td>7:08.80</td><td>413.46 MB</td><td>0.5297</td><td>0.5459</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Apple Lossless</td><td>19:53.27</td><td>10:01.86</td><td>414.45 MB</td><td>0.5310</td><td>0.5496</td></tr>
-			<tr><td>Bonk 0.5</td><td>36:56.36</td><td>27:09.35</td><td>418.65 MB</td><td>0.5364</td><td>0.5543</td></tr>
-			<tr bgcolor="#D3D4C5"><td>flac 1.1.1 (-3)</td><td>9:51.58</td><td>7:00.92</td><td>419.29 MB</td><td>0.5372</td><td>0.5544</td></tr>
-			<tr><td>flac 1.1.1 (-1)</td><td>8:37.94</td><td>7:15.87</td><td>432.32 MB</td><td>0.5539</td><td>0.5706</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Ogg Squish 0.98</td><td>?</td><td>?</td><td>431.08 MB</td><td>0.5522</td><td>0.5714</td></tr>
+			<tr bgcolor="#D4D4C0"><td>LPAC 1.40 (-r, high)</td><td>24:56.56</td><td>11:51.64</td><td>404.03 MB</td><td>0.5176</td><td>0.5323</td></tr>
+			<tr><td>flac 1.1.3 (-8)</td><td>56:13.92</td><td>7:06.74</td><td>406.68 MB</td><td>0.5210</td><td>0.5371</td></tr>
+			<tr bgcolor="#D4D4C0"><td>WavPack 4.31 (normal)</td><td>10:18.41</td><td>7:57.83</td><td>408.15 MB</td><td>0.5229</td><td>0.5388</td></tr>
+			<tr bgcolor="#FFFFFF"><td>flac 1.1.3 (-5, default)</td><td>13:27.55</td><td>7:04.99</td><td>409.68 MB</td><td>0.5248</td><td>0.5414</td></tr>
+			<tr bgcolor="#D4D4C0"><td>WavPack 4.31 (fast -x)</td><td>67:42.10</td><td>6:55.86</td><td>409.87 MB</td><td>0.5251</td><td>0.5417</td></tr>
+			<tr><td>WavPack 4.31 (fast)</td><td>9:13.06</td><td>7:04.19</td><td>414.94 MB</td><td>0.5316</td><td>0.5493</td></tr>
+			<tr bgcolor="#D4D4C0"><td>Apple Lossless</td><td>19:53.27</td><td>10:01.86</td><td>414.45 MB</td><td>0.5310</td><td>0.5496</td></tr>
+			<tr><td>flac 1.1.3 (-3)</td><td>10:05.45</td><td>6:51.49</td><td>415.28 MB</td><td>0.5320</td><td>0.5497</td></tr>
+			<tr bgcolor="#D4D4C0"><td>Bonk 0.5</td><td>36:56.36</td><td>27:09.35</td><td>418.65 MB</td><td>0.5364</td><td>0.5543</td></tr>
+			<tr><td>flac 1.1.3 (-1)</td><td>8:23.12</td><td>7:03.42</td><td>432.27 MB</td><td>0.5538</td><td>0.5704</td></tr>
+			<tr bgcolor="#D4D4C0"><td>Ogg Squish 0.98</td><td>?</td><td>?</td><td>431.08 MB</td><td>0.5522</td><td>0.5714</td></tr>
 			<tr><td>Shorten 3.2a (-p0 -b256, default)</td><td>9:44.48</td><td>6:31.74</td><td>433.56 MB</td><td>0.5555</td><td>0.5729</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Kexis 0.2.2</td><td>17:49.06</td><td>14:53.90</td><td>434.33 MB</td><td>0.5564</td><td>0.5750</td></tr>
-			<tr><td>Shorten 3.2a (-p8 -b2048)</td><td>12:00.04</td><td>7:25.12</td><td>438.86 MB</td><td>0.5622</td><td>0.5810</td></tr>
-			<tr bgcolor="#D3D4C5"><td>WavPack 3.97a (fast)</td><td>5:20.17</td><td>5:12.38</td><td>441.88 MB</td><td>0.5661</td><td>0.5857</td></tr>
-			<tr><td>WaveZIP</td><td>8:41.72</td><td>?</td><td>452.95 MB</td><td>0.5802</td><td>0.5986</td></tr>
-			<tr bgcolor="#D3D4C5"><td>RIFF WAVE</td><td>77:19.89</td><td>77:19.89</td><td>780.56 MB</td><td>1.0000</td><td>1.0000</td></tr>
+			<tr bgcolor="#D4D4C0"><td>Shorten 3.2a (-p8 -b2048)</td><td>12:00.04</td><td>7:25.12</td><td>438.86 MB</td><td>0.5622</td><td>0.5810</td></tr>
+			<tr><td>RIFF WAVE</td><td>77:19.89</td><td>77:19.89</td><td>780.56 MB</td><td>1.0000</td><td>1.0000</td></tr>
 		</table>
 		</td></tr></table>
 		<br />
@@ -677,493 +584,464 @@
 				</td>
 			</tr>
 			<tr>
-				<td align="right" rowspan="28" bgcolor="#F4F4CC">
+				<td align="right" rowspan="26" bgcolor="#F4F4CC">
 					Dream Theater<br /><i>6:00</i>
 				</td>
 			</tr>
-			<!-- bgcolor="#D3D4C5" -->
+			<!-- bgcolor="#D4D4C0" -->
 			<tr><td>La 0.3c</td><td>11:37.69</td><td>11:15.37</td><td>42.72 MB</td><td>0.7306</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Monkey's Audio 3.99 (insane)</td><td>10:03.39</td><td>10:29.37</td><td>42.99 MB</td><td>0.7352</td></tr>
+			<tr bgcolor="#D4D4C0"><td>Monkey's Audio 3.99 (insane)</td><td>10:03.39</td><td>10:29.37</td><td>42.99 MB</td><td>0.7352</td></tr>
 			<tr><td>Monkey's Audio 3.99 (extra high)</td><td>2:14.70</td><td>2:19.62</td><td>43.06 MB</td><td>0.7364</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Monkey's Audio 3.99 (high)</td><td>1:15.91</td><td>1:19.00</td><td>43.21 MB</td><td>0.7391</td></tr>
+			<tr bgcolor="#D4D4C0"><td>Monkey's Audio 3.99 (high)</td><td>1:15.91</td><td>1:19.00</td><td>43.21 MB</td><td>0.7391</td></tr>
 			<tr><td>optimFROG 4.21 (mode 1 @ 4x)</td><td>1:53.28</td><td>2:00.45</td><td>43.26 MB</td><td>0.7398</td></tr>
-			<tr bgcolor="#D3D4C5"><td>optimFROG 4.21 (mode 4 @ 1x)</td><td>25:32.41</td><td>25:38.15</td><td>43.26 MB</td><td>0.7398</td></tr>
+			<tr bgcolor="#D4D4C0"><td>optimFROG 4.21 (mode 4 @ 1x)</td><td>25:32.41</td><td>25:38.15</td><td>43.26 MB</td><td>0.7398</td></tr>
 			<tr><td>Monkey's Audio 3.99 (normal)</td><td>1:05.10</td><td>1:08.51</td><td>43.30 MB</td><td>0.7405</td></tr>
-			<tr bgcolor="#D3D4C5"><td>optimFROG 4.21 (mode 0 @ 4x)</td><td>1:17.95</td><td>1:25.67</td><td>43.42 MB</td><td>0.7426</td></tr>
-			<tr><td>WavPack 3.97a (high)</td><td>1:10.34</td><td>1:08.61</td><td>43.49 MB</td><td>0.7438</td></tr>
-			<tr bgcolor="#D3D4C5"><td>RKAU 1.07 (normal)</td><td>1:57.68</td><td>1:33.38</td><td>43.81 MB</td><td>0.7493</td></tr>
+			<tr bgcolor="#D4D4C0"><td>optimFROG 4.21 (mode 0 @ 4x)</td><td>1:17.95</td><td>1:25.67</td><td>43.42 MB</td><td>0.7426</td></tr>
+			<tr><td>WavPack 4.31 (high)</td><td>1:06.38</td><td>0:55.69</td><td>43.56 MB</td><td>0.7449</td></tr>
+			<tr bgcolor="#D4D4C0"><td>RKAU 1.07 (normal)</td><td>1:57.68</td><td>1:33.38</td><td>43.81 MB</td><td>0.7493</td></tr>
 			<tr><td>Monkey's Audio 3.99 (fast)</td><td>0:51.65</td><td>0:56.13</td><td>43.86 MB</td><td>0.7501</td></tr>
-			<tr bgcolor="#D3D4C5"><td>LPAC 1.40 (-r, normal)</td><td>1:27.61</td><td>0:56.18</td><td>44.12 MB</td><td>0.7545</td></tr>
-			<tr><td>flac 1.1.1 (-8)</td><td>4:18.72</td><td>0:37.28</td><td>44.33 MB</td><td>0.7582</td></tr>
-			<tr bgcolor="#D3D4C5"><td>WavPack 3.97a (normal)</td><td>0:40.24</td><td>0:40.70</td><td>44.34 MB</td><td>0.7583</td></tr>
+			<tr bgcolor="#D4D4C0"><td>WavPack 4.31 (normal -x)</td><td>9:18.37</td><td>0:39.82</td><td>43.90 MB</td><td>0.7508</td></tr>
+			<tr><td>LPAC 1.40 (-r, normal)</td><td>1:27.61</td><td>0:56.18</td><td>44.12 MB</td><td>0.7545</td></tr>
+			<tr bgcolor="#D4D4C0"><td>flac 1.1.3 (-8)</td><td>4:24.50</td><td>0:36.38</td><td>44.17 MB</td><td>0.7554</td></tr>
+			<tr><td>WavPack 4.31 (normal)</td><td>0:48.81</td><td>0:39.74</td><td>44.25 MB</td><td>0.7568</td></tr>
+			<tr bgcolor="#FFFFFF"><td>flac 1.1.3 (-5, default)</td><td>1:03.75</td><td>0:35.75</td><td>44.26 MB</td><td>0.7570</td></tr>
 			<tr><td>Bonk 0.5</td><td>2:56.03</td><td>2:11.58</td><td>44.35 MB</td><td>0.7585</td></tr>
-			<tr bgcolor="#FFFFFF"><td>flac 1.1.1 (-5, default)</td><td>1:01.31</td><td>0:37.01</td><td>44.41 MB</td><td>0.7595</td></tr>
+			<tr bgcolor="#D4D4C0"><td>flac 1.1.3 (-3)</td><td>0:48.85</td><td>0:35.14</td><td>44.66 MB</td><td>0.7638</td></tr>
 			<tr><td>Apple Lossless</td><td>?</td><td>?</td><td>44.74 MB</td><td>0.7653</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Shorten 3.2a (-p8 -b2048)</td><td>0:58.81</td><td>0:37.63</td><td>44.75 MB</td><td>0.7654</td></tr>
-			<tr><td>flac 1.1.1 (-3)</td><td>0:49.05</td><td>0:36.44</td><td>44.78 MB</td><td>0.7659</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Ogg Squish 0.98</td><td>?</td><td>?</td><td>45.17 MB</td><td>0.7725</td></tr>
-			<tr><td>Pegasus-SPS</td><td>4:45.00</td><td>?</td><td>45.40 MB</td><td>0.7765</td></tr>
-			<tr bgcolor="#D3D4C5"><td>WavPack 3.97a (fast)</td><td>0:18.66</td><td>0:18.59</td><td>46.31 MB</td><td>0.7920</td></tr>
-			<tr><td>Kexis 0.2.2</td><td>1:24.83</td><td>1:10.93</td><td>46.52 MB</td><td>0.7956</td></tr>
-			<tr bgcolor="#D3D4C5"><td>flac 1.1.1 (-1)</td><td>0:44.00</td><td>0:36.91</td><td>46.65 MB</td><td>0.7978</td></tr>
+			<tr bgcolor="#D4D4C0"><td>Shorten 3.2a (-p8 -b2048)</td><td>0:58.81</td><td>0:37.63</td><td>44.75 MB</td><td>0.7654</td></tr>
+			<tr><td>Ogg Squish 0.98</td><td>?</td><td>?</td><td>45.17 MB</td><td>0.7725</td></tr>
+			<tr bgcolor="#D4D4C0"><td>flac 1.1.3 (-1)</td><td>0:42.04</td><td>0:36.20</td><td>46.64 MB</td><td>0.7977</td></tr>
 			<tr><td>Shorten 3.2a (-p0 -b256, default)</td><td>0:47.75</td><td>0:32.56</td><td>46.68 MB</td><td>0.7984</td></tr>
-			<tr bgcolor="#D3D4C5"><td>WaveZIP</td><td>0:38.99</td><td>?</td><td>47.22 MB</td><td>0.8077</td></tr>
-			<tr><td>RIFF WAVE</td><td>5:47.56</td><td>5:47.56</td><td>58.47 MB</td><td>1.0000</td></tr>
+			<tr bgcolor="#D4D4C0"><td>RIFF WAVE</td><td>5:47.56</td><td>5:47.56</td><td>58.47 MB</td><td>1.0000</td></tr>
 			<tr>
 				<td colspan="6" bgcolor="#F4F4CC">&nbsp;</td>
 			</tr>
 			<tr>
-				<td align="right" rowspan="27" bgcolor="#F4F4CC">
+				<td align="right" rowspan="26" bgcolor="#F4F4CC">
 					Eddie Warner<br /><i>Titus</i>
 				</td>
 			</tr>
-			<!-- bgcolor="#D3D4C5" -->
-			<tr><td>La 0.3c</td><td>5:24.56</td><td>5:13.29</td><td>14.76 MB</td><td>0.5298</td></tr>
-			<tr bgcolor="#D3D4C5"><td>LPAC 1.40 (-r, normal)</td><td>0:40.76</td><td>0:21.21</td><td>14.77 MB</td><td>0.5298</td></tr>
-			<tr><td>flac 1.1.1 (-8)</td><td>1:57.87</td><td>0:15.05</td><td>15.01 MB</td><td>0.5385</td></tr>
-			<tr bgcolor="#D3D4C5"><td>optimFROG 4.21 (mode 1 @ 4x)</td><td>0:53.39</td><td>0:55.52</td><td>15.01 MB</td><td>0.5385</td></tr>
+			<!-- bgcolor="#D4D4C0" -->
+			<tr><td>WavPack 4.31 (high)</td><td>0:42.44</td><td>0:25.01</td><td>14.18 MB</td><td>0.5087</td></tr>
+			<tr bgcolor="#D4D4C0"><td>WavPack 4.31 (normal -x)</td><td>4:08.93</td><td>0:16.60</td><td>14.27 MB</td><td>0.5119</td></tr>
+			<tr><td>WavPack 4.31 (normal)</td><td>0:24.77</td><td>0:16.89</td><td>14.31 MB</td><td>0.5135</td></tr>
+			<tr bgcolor="#D4D4C0"><td>La 0.3c</td><td>5:24.56</td><td>5:13.29</td><td>14.76 MB</td><td>0.5298</td></tr>
+			<tr><td>LPAC 1.40 (-r, normal)</td><td>0:40.76</td><td>0:21.21</td><td>14.77 MB</td><td>0.5298</td></tr>
+			<tr bgcolor="#D4D4C0"><td>flac 1.1.3 (-8)</td><td>1:59.78</td><td>0:15.28</td><td>14.88 MB</td><td>0.5341</td></tr>
+			<tr><td>optimFROG 4.21 (mode 1 @ 4x)</td><td>0:53.39</td><td>0:55.52</td><td>15.01 MB</td><td>0.5385</td></tr>
+			<tr bgcolor="#FFFFFF"><td>flac 1.1.3 (-5, default)</td><td>0:29.25</td><td>0:14.55</td><td>15.02 MB</td><td>0.5388</td></tr>
 			<tr><td>optimFROG 4.21 (mode 4 @ 1x)</td><td>12:02.54</td><td>12:03.76</td><td>15.02 MB</td><td>0.5390</td></tr>
-			<tr bgcolor="#FFFFFF"><td>flac 1.1.1 (-5, default)</td><td>0:28.17</td><td>0:15.05</td><td>15.12 MB</td><td>0.5424</td></tr>
-			<tr><td>optimFROG 4.21 (mode 0 @ 4x)</td><td>0:36.81</td><td>0:39.19</td><td>15.13 MB</td><td>0.5429</td></tr>
-			<tr bgcolor="#D3D4C5"><td>RKAU 1.07 (normal)</td><td>0:54.82</td><td>0:42.71</td><td>15.15 MB</td><td>0.5435</td></tr>
-			<tr><td>Monkey's Audio 3.99 (extra high)</td><td>1:03.04</td><td>1:04.55</td><td>15.15 MB</td><td>0.5436</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Monkey's Audio 3.99 (insane)</td><td>4:44.06</td><td>4:55.17</td><td>15.18 MB</td><td>0.5447</td></tr>
-			<tr><td>Monkey's Audio 3.99 (high)</td><td>0:34.33</td><td>0:36.23</td><td>15.26 MB</td><td>0.5474</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Monkey's Audio 3.99 (normal)</td><td>0:29.62</td><td>0:31.38</td><td>15.27 MB</td><td>0.5479</td></tr>
-			<tr><td>flac 1.1.1 (-3)</td><td>0:22.21</td><td>0:14.72</td><td>15.43 MB</td><td>0.5538</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Monkey's Audio 3.99 (fast)</td><td>0:23.15</td><td>0:25.44</td><td>15.55 MB</td><td>0.5579</td></tr>
-			<tr><td>WavPack 3.97a (high)</td><td>0:32.15</td><td>0:31.18</td><td>15.57 MB</td><td>0.5585</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Shorten 3.2a (-p0 -b256, default)</td><td>0:21.16</td><td>0:13.55</td><td>15.78 MB</td><td>0.5662</td></tr>
-			<tr><td>WavPack 3.97a (normal)</td><td>0:18.25</td><td>0:17.67</td><td>15.86 MB</td><td>0.5692</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Shorten 3.2a (-p8 -b2048)</td><td>0:26.82</td><td>0:16.75</td><td>16.21 MB</td><td>0.5818</td></tr>
-			<tr><td>Apple Lossless</td><td>?</td><td>?</td><td>16.36 MB</td><td>0.5871</td></tr>
-			<tr bgcolor="#D3D4C5"><td>flac 1.1.1 (-1)</td><td>0:19.75</td><td>0:15.76</td><td>16.39 MB</td><td>0.5880</td></tr>
-			<tr><td>Bonk 0.5</td><td>1:22.01</td><td>1:00.12</td><td>16.73 MB</td><td>0.6003</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Ogg Squish 0.98</td><td>?</td><td>?</td><td>17.03 MB</td><td>0.6112</td></tr>
-			<tr><td>Kexis 0.2.2</td><td>0:38.72</td><td>0:32.25</td><td>17.40 MB</td><td>0.6242</td></tr>
-			<tr bgcolor="#D3D4C5"><td>WavPack 3.97a (fast)</td><td>0:08.19</td><td>0:08.79</td><td>17.49 MB</td><td>0.6275</td></tr>
-			<tr><td>WaveZIP</td><td>0:17.55</td><td>?</td><td>17.89 MB</td><td>0.6420</td></tr>
-			<tr bgcolor="#D3D4C5"><td>RIFF WAVE</td><td>2:35.67</td><td>2:35.67</td><td>27.87 MB</td><td>1.0000</td></tr>
+			<tr bgcolor="#D4D4C0"><td>optimFROG 4.21 (mode 0 @ 4x)</td><td>0:36.81</td><td>0:39.19</td><td>15.13 MB</td><td>0.5429</td></tr>
+			<tr><td>RKAU 1.07 (normal)</td><td>0:54.82</td><td>0:42.71</td><td>15.15 MB</td><td>0.5435</td></tr>
+			<tr bgcolor="#D4D4C0"><td>Monkey's Audio 3.99 (extra high)</td><td>1:03.04</td><td>1:04.55</td><td>15.15 MB</td><td>0.5436</td></tr>
+			<tr><td>Monkey's Audio 3.99 (insane)</td><td>4:44.06</td><td>4:55.17</td><td>15.18 MB</td><td>0.5447</td></tr>
+			<tr bgcolor="#D4D4C0"><td>Monkey's Audio 3.99 (high)</td><td>0:34.33</td><td>0:36.23</td><td>15.26 MB</td><td>0.5474</td></tr>
+			<tr><td>Monkey's Audio 3.99 (normal)</td><td>0:29.62</td><td>0:31.38</td><td>15.27 MB</td><td>0.5479</td></tr>
+			<tr bgcolor="#D4D4C0"><td>flac 1.1.3 (-3)</td><td>0:21.78</td><td>0:14.41</td><td>15.27 MB</td><td>0.5481</td></tr>
+			<tr><td>Monkey's Audio 3.99 (fast)</td><td>0:23.15</td><td>0:25.44</td><td>15.55 MB</td><td>0.5579</td></tr>
+			<tr bgcolor="#D4D4C0"><td>Shorten 3.2a (-p0 -b256, default)</td><td>0:21.16</td><td>0:13.55</td><td>15.78 MB</td><td>0.5662</td></tr>
+			<tr><td>Shorten 3.2a (-p8 -b2048)</td><td>0:26.82</td><td>0:16.75</td><td>16.21 MB</td><td>0.5818</td></tr>
+			<tr bgcolor="#D4D4C0"><td>Apple Lossless</td><td>?</td><td>?</td><td>16.36 MB</td><td>0.5871</td></tr>
+			<tr><td>flac 1.1.3 (-1)</td><td>0:18.13</td><td>0:15.12</td><td>16.38 MB</td><td>0.5878</td></tr>
+			<tr bgcolor="#D4D4C0"><td>Bonk 0.5</td><td>1:22.01</td><td>1:00.12</td><td>16.73 MB</td><td>0.6003</td></tr>
+			<tr><td>Ogg Squish 0.98</td><td>?</td><td>?</td><td>17.03 MB</td><td>0.6112</td></tr>
+			<tr bgcolor="#D4D4C0"><td>RIFF WAVE</td><td>2:35.67</td><td>2:35.67</td><td>27.87 MB</td><td>1.0000</td></tr>
 			<tr>
 				<td colspan="6" bgcolor="#F4F4CC">&nbsp;</td>
 			</tr>
 			<tr>
-				<td align="right" rowspan="27" bgcolor="#F4F4CC">
+				<td align="right" rowspan="26" bgcolor="#F4F4CC">
 					Tool<br /><i>Forty-six &amp; 2</i>
 				</td>
 			</tr>
-			<!-- bgcolor="#D3D4C5" -->
+			<!-- bgcolor="#D4D4C0" -->
 			<tr><td>La 0.3c</td><td>12:34.97</td><td>12:09.08</td><td>37.42 MB</td><td>0.5824</td></tr>
-			<tr bgcolor="#D3D4C5"><td>optimFROG 4.21 (mode 4 @ 1x)</td><td>27:58.28</td><td>28:01.87</td><td>37.96 MB</td><td>0.5907</td></tr>
+			<tr bgcolor="#D4D4C0"><td>optimFROG 4.21 (mode 4 @ 1x)</td><td>27:58.28</td><td>28:01.87</td><td>37.96 MB</td><td>0.5907</td></tr>
 			<tr><td>Monkey's Audio 3.99 (insane)</td><td>10:55.31</td><td>11:24.76</td><td>38.00 MB</td><td>0.5914</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Monkey's Audio 3.99 (extra high)</td><td>2:24.02</td><td>2:33.44</td><td>38.03 MB</td><td>0.5919</td></tr>
+			<tr bgcolor="#D4D4C0"><td>Monkey's Audio 3.99 (extra high)</td><td>2:24.02</td><td>2:33.44</td><td>38.03 MB</td><td>0.5919</td></tr>
 			<tr><td>optimFROG 4.21 (mode 1 @ 4x)</td><td>2:03.43</td><td>2:09.27</td><td>38.15 MB</td><td>0.5937</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Monkey's Audio 3.99 (high)</td><td>1:19.07</td><td>1:24.02</td><td>38.21 MB</td><td>0.5947</td></tr>
+			<tr bgcolor="#D4D4C0"><td>Monkey's Audio 3.99 (high)</td><td>1:19.07</td><td>1:24.02</td><td>38.21 MB</td><td>0.5947</td></tr>
 			<tr><td>Monkey's Audio 3.99 (normal)</td><td>1:07.84</td><td>1:12.00</td><td>38.38 MB</td><td>0.5973</td></tr>
-			<tr bgcolor="#D3D4C5"><td>optimFROG 4.21 (mode 0 @ 4x)</td><td>1:24.44</td><td>1:30.97</td><td>38.68 MB</td><td>0.6020</td></tr>
-			<tr><td>WavPack 3.97a (high)</td><td>1:02.47</td><td>1:14.54</td><td>38.86 MB</td><td>0.6048</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Monkey's Audio 3.99 (fast)</td><td>0:53.72</td><td>0:58.89</td><td>39.09 MB</td><td>0.6084</td></tr>
-			<tr><td>RKAU 1.07 (normal)</td><td>2:16.00</td><td>1:41.84</td><td>39.42 MB</td><td>0.6135</td></tr>
-			<tr bgcolor="#D3D4C5"><td>WavPack 3.97a (normal)</td><td>0:29.07</td><td>0:42.87</td><td>39.92 MB</td><td>0.6213</td></tr>
-			<tr><td>LPAC 1.40 (-r, normal)</td><td>1:38.01</td><td>0:57.56</td><td>40.25 MB</td><td>0.6263</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Apple Lossless</td><td>?</td><td>?</td><td>40.75 MB</td><td>0.6342</td></tr>
-			<tr><td>flac 1.1.1 (-8)</td><td>4:35.08</td><td>0:39.40</td><td>40.89 MB</td><td>0.6363</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Bonk 0.5</td><td>3:07.20</td><td>2:21.28</td><td>40.98 MB</td><td>0.6378</td></tr>
-			<tr bgcolor="#FFFFFF"><td>flac 1.1.1 (-5, default)</td><td>1:05.54</td><td>0:39.65</td><td>41.04 MB</td><td>0.6388</td></tr>
-			<tr bgcolor="#D3D4C5"><td>flac 1.1.1 (-3)</td><td>0:50.18</td><td>0:38.92</td><td>41.74 MB</td><td>0.6496</td></tr>
-			<tr><td>Ogg Squish 0.98</td><td>?</td><td>?</td><td>42.27 MB</td><td>0.6578</td></tr>
-			<tr bgcolor="#D3D4C5"><td>flac 1.1.1 (-1)</td><td>0:45.83</td><td>0:40.89</td><td>42.70 MB</td><td>0.6646</td></tr>
-			<tr><td>Kexis 0.2.2</td><td>1:30.09</td><td>1:16.29</td><td>42.75 MB</td><td>0.6652</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Shorten 3.2a (-p8 -b2048)</td><td>1:02.42</td><td>0:37.84</td><td>43.06 MB</td><td>0.6701</td></tr>
+			<tr bgcolor="#D4D4C0"><td>optimFROG 4.21 (mode 0 @ 4x)</td><td>1:24.44</td><td>1:30.97</td><td>38.68 MB</td><td>0.6020</td></tr>
+			<tr><td>WavPack 4.31 (high)</td><td>1:14.30</td><td>0:58.85</td><td>38.86 MB</td><td>0.6047</td></tr>
+			<tr bgcolor="#D4D4C0"><td>Monkey's Audio 3.99 (fast)</td><td>0:53.72</td><td>0:58.89</td><td>39.09 MB</td><td>0.6084</td></tr>
+			<tr><td>WavPack 4.31 (normal -x)</td><td>10:04.75</td><td>0:40.51</td><td>39.33 MB</td><td>0.6121</td></tr>
+			<tr bgcolor="#D4D4C0"><td>RKAU 1.07 (normal)</td><td>2:16.00</td><td>1:41.84</td><td>39.42 MB</td><td>0.6135</td></tr>
+			<tr><td>WavPack 4.31 (normal)</td><td>0:52.54</td><td>0:40.84</td><td>40.03 MB</td><td>0.6231</td></tr>
+			<tr bgcolor="#D4D4C0"><td>LPAC 1.40 (-r, normal)</td><td>1:38.01</td><td>0:57.56</td><td>40.25 MB</td><td>0.6263</td></tr>
+			<tr><td>flac 1.1.3 (-8)</td><td>4:41.01</td><td>0:37.59</td><td>40.28 MB</td><td>0.6269</td></tr>
+			<tr bgcolor="#FFFFFF"><td>flac 1.1.3 (-5, default)</td><td>1:08.80</td><td>0:37.89</td><td>40.58 MB</td><td>0.6316</td></tr>
+			<tr><td>Apple Lossless</td><td>?</td><td>?</td><td>40.75 MB</td><td>0.6342</td></tr>
+			<tr bgcolor="#D4D4C0"><td>Bonk 0.5</td><td>3:07.20</td><td>2:21.28</td><td>40.98 MB</td><td>0.6378</td></tr>
+			<tr><td>flac 1.1.3 (-3)</td><td>0:54.14</td><td>0:38.33</td><td>41.17 MB</td><td>0.6407</td></tr>
+			<tr bgcolor="#D4D4C0"><td>Ogg Squish 0.98</td><td>?</td><td>?</td><td>42.27 MB</td><td>0.6578</td></tr>
+			<tr><td>flac 1.1.3 (-1)</td><td>0:43.64</td><td>0:37.56</td><td>42.70 MB</td><td>0.6645</td></tr>
+			<tr bgcolor="#D4D4C0"><td>Shorten 3.2a (-p8 -b2048)</td><td>1:02.42</td><td>0:37.84</td><td>43.06 MB</td><td>0.6701</td></tr>
 			<tr><td>Shorten 3.2a (-p0 -b256, default)</td><td>0:51.29</td><td>0:34.59</td><td>43.18 MB</td><td>0.6721</td></tr>
-			<tr bgcolor="#D3D4C5"><td>WavPack 3.97a (fast)</td><td>0:31.26</td><td>0:28.79</td><td>43.65 MB</td><td>0.6794</td></tr>
-			<tr><td>WaveZIP</td><td>0:42.84</td><td>?</td><td>44.52 MB</td><td>0.6930</td></tr>
-			<tr bgcolor="#D3D4C5"><td>RIFF WAVE</td><td>6:21.92</td><td>6:21.92</td><td>64.25 MB</td><td>1.0000</td></tr>
+			<tr bgcolor="#D4D4C0"><td>RIFF WAVE</td><td>6:21.92</td><td>6:21.92</td><td>64.25 MB</td><td>1.0000</td></tr>
 			<tr>
 				<td colspan="6" bgcolor="#F4F4CC">&nbsp;</td>
 			</tr>
 			<tr>
-				<td align="right" rowspan="27" bgcolor="#F4F4CC">
+				<td align="right" rowspan="26" bgcolor="#F4F4CC">
 					Cannibal Corpse<br /><i>Mummified In Barbed Wire</i>
 				</td>
 			</tr>
-			<!-- bgcolor="#D3D4C5" -->
+			<!-- bgcolor="#D4D4C0" -->
 			<tr><td>La 0.3c</td><td>6:35.94</td><td>6:23.57</td><td>22.69 MB</td><td>0.6798</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Monkey's Audio 3.99 (insane)</td><td>5:42.63</td><td>5:59.53</td><td>22.83 MB</td><td>0.6839</td></tr>
+			<tr bgcolor="#D4D4C0"><td>Monkey's Audio 3.99 (insane)</td><td>5:42.63</td><td>5:59.53</td><td>22.83 MB</td><td>0.6839</td></tr>
 			<tr><td>Monkey's Audio 3.99 (extra high)</td><td>1:15.58</td><td>1:19.31</td><td>22.85 MB</td><td>0.6847</td></tr>
-			<tr bgcolor="#D3D4C5"><td>optimFROG 4.21 (mode 4 @ 1x)</td><td>14:34.28</td><td>14:37.69</td><td>22.95 MB</td><td>0.6877</td></tr>
+			<tr bgcolor="#D4D4C0"><td>optimFROG 4.21 (mode 4 @ 1x)</td><td>14:34.28</td><td>14:37.69</td><td>22.95 MB</td><td>0.6877</td></tr>
 			<tr><td>Monkey's Audio 3.99 (high)</td><td>0:41.91</td><td>0:45.49</td><td>23.18 MB</td><td>0.6945</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Monkey's Audio 3.99 (normal)</td><td>0:36.03</td><td>0:38.34</td><td>23.24 MB</td><td>0.6963</td></tr>
+			<tr bgcolor="#D4D4C0"><td>Monkey's Audio 3.99 (normal)</td><td>0:36.03</td><td>0:38.34</td><td>23.24 MB</td><td>0.6963</td></tr>
 			<tr><td>optimFROG 4.21 (mode 1 @ 4x)</td><td>1:03.96</td><td>1:08.85</td><td>23.31 MB</td><td>0.6984</td></tr>
-			<tr bgcolor="#D3D4C5"><td>RKAU 1.07 (normal)</td><td>1:09.71</td><td>0:56.66</td><td>23.34 MB</td><td>0.6993</td></tr>
-			<tr><td>LPAC 1.40 (-r, normal)</td><td>1:05.38</td><td>0:36.20</td><td>23.53 MB</td><td>0.7050</td></tr>
-			<tr bgcolor="#D3D4C5"><td>WavPack 3.97a (high)</td><td>0:32.99</td><td>0:40.05</td><td>23.57 MB</td><td>0.7062</td></tr>
-			<tr><td>optimFROG 4.21 (mode 0 @ 4x)</td><td>0:44.14</td><td>0:48.71</td><td>23.95 MB</td><td>0.7176</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Monkey's Audio 3.99 (fast)</td><td>0:28.61</td><td>0:31.53</td><td>24.14 MB</td><td>0.7234</td></tr>
-			<tr><td>flac 1.1.1 (-8)</td><td>2:25.59</td><td>0:20.85</td><td>24.18 MB</td><td>0.7245</td></tr>
-			<tr bgcolor="#FFFFFF"><td>flac 1.1.1 (-5, default)</td><td>0:34.66</td><td>0:21.42</td><td>24.30 MB</td><td>0.7282</td></tr>
-			<tr><td>Bonk 0.5</td><td>1:40.38</td><td>1:14.58</td><td>24.36 MB</td><td>0.7297</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Apple Lossless</td><td>?</td><td>?</td><td>24.37 MB</td><td>0.7301</td></tr>
-			<tr><td>WavPack 3.97a (normal)</td><td>0:15.99</td><td>0:23.50</td><td>24.76 MB</td><td>0.7418</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Shorten 3.2a (-p8 -b2048)</td><td>0:33.74</td><td>0:22.47</td><td>25.12 MB</td><td>0.7526</td></tr>
-			<tr><td>flac 1.1.1 (-3)</td><td>0:27.40</td><td>0:20.11</td><td>25.16 MB</td><td>0.7539</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Ogg Squish 0.98</td><td>?</td><td>?</td><td>25.23 MB</td><td>0.7558</td></tr>
-			<tr><td>Kexis 0.2.2</td><td>0:47.13</td><td>0:40.67</td><td>26.03 MB</td><td>0.7799</td></tr>
-			<tr bgcolor="#D3D4C5"><td>flac 1.1.1 (-1)</td><td>0:24.04</td><td>0:21.68</td><td>26.10 MB</td><td>0.7819</td></tr>
-			<tr><td>WavPack 3.97a (fast)</td><td>0:16.79</td><td>0:21.64</td><td>26.17 MB</td><td>0.7841</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Shorten 3.2a (-p0 -b256, default)</td><td>0:28.20</td><td>0:20.46</td><td>26.61 MB</td><td>0.7972</td></tr>
-			<tr><td>WaveZIP</td><td>0:22.25</td><td>?</td><td>26.89 MB</td><td>0.8058</td></tr>
-			<tr bgcolor="#D3D4C5"><td>RIFF WAVE</td><td>3:18.36</td><td>3:18.36</td><td>33.37 MB</td><td>1.0000</td></tr>
+			<tr bgcolor="#D4D4C0"><td>RKAU 1.07 (normal)</td><td>1:09.71</td><td>0:56.66</td><td>23.34 MB</td><td>0.6993</td></tr>
+			<tr><td>WavPack 4.31 (high)</td><td>0:39.56</td><td>0:31.42</td><td>23.53 MB</td><td>0.7050</td></tr>
+			<tr bgcolor="#D4D4C0"><td>LPAC 1.40 (-r, normal)</td><td>1:05.38</td><td>0:36.20</td><td>23.53 MB</td><td>0.7050</td></tr>
+			<tr><td>flac 1.1.3 (-8)</td><td>2:29.54</td><td>0:22.80</td><td>23.82 MB</td><td>0.7138</td></tr>
+			<tr bgcolor="#D4D4C0"><td>optimFROG 4.21 (mode 0 @ 4x)</td><td>0:44.14</td><td>0:48.71</td><td>23.95 MB</td><td>0.7176</td></tr>
+			<tr bgcolor="#FFFFFF"><td>flac 1.1.3 (-5, default)</td><td>0:36.38</td><td>0:20.62</td><td>24.08 MB</td><td>0.7213</td></tr>
+			<tr bgcolor="#D4D4C0"><td>Monkey's Audio 3.99 (fast)</td><td>0:28.61</td><td>0:31.53</td><td>24.14 MB</td><td>0.7234</td></tr>
+			<tr><td>WavPack 4.31 (normal -x)</td><td>5:10.16</td><td>0:22.01</td><td>24.18 MB</td><td>0.7246</td></tr>
+			<tr bgcolor="#D4D4C0"><td>Bonk 0.5</td><td>1:40.38</td><td>1:14.58</td><td>24.36 MB</td><td>0.7297</td></tr>
+			<tr><td>Apple Lossless</td><td>?</td><td>?</td><td>24.37 MB</td><td>0.7301</td></tr>
+			<tr bgcolor="#D4D4C0"><td>WavPack 4.31 (normal)</td><td>0:27.77</td><td>0:22.22</td><td>24.64 MB</td><td>0.7381</td></tr>
+			<tr><td>flac 1.1.3 (-3)</td><td>0:27.52</td><td>0:20.56</td><td>25.08 MB</td><td>0.7515</td></tr>
+			<tr bgcolor="#D4D4C0"><td>Shorten 3.2a (-p8 -b2048)</td><td>0:33.74</td><td>0:22.47</td><td>25.12 MB</td><td>0.7526</td></tr>
+			<tr><td>Ogg Squish 0.98</td><td>?</td><td>?</td><td>25.23 MB</td><td>0.7558</td></tr>
+			<tr bgcolor="#D4D4C0"><td>flac 1.1.3 (-1)</td><td>0:23.47</td><td>0:20.70</td><td>26.09 MB</td><td>0.7818</td></tr>
+			<tr><td>Shorten 3.2a (-p0 -b256, default)</td><td>0:28.20</td><td>0:20.46</td><td>26.61 MB</td><td>0.7972</td></tr>
+			<tr bgcolor="#D4D4C0"><td>RIFF WAVE</td><td>3:18.36</td><td>3:18.36</td><td>33.37 MB</td><td>1.0000</td></tr>
 			<tr>
 				<td colspan="6" bgcolor="#F4F4CC">&nbsp;</td>
 			</tr>
 			<tr>
-				<td align="right" rowspan="27" bgcolor="#F4F4CC">
-					Alanis Morisette<br /><i>Hand In My Pocket</i>
+				<td align="right" rowspan="26" bgcolor="#F4F4CC">
+					Alanis Morissette<br /><i>Hand In My Pocket</i>
 				</td>
 			</tr>
-			<!-- bgcolor="#D3D4C5" -->
+			<!-- bgcolor="#D4D4C0" -->
 			<tr><td>La 0.3c</td><td>7:35.21</td><td>7:20.19</td><td>20.77 MB</td><td>0.5312</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Monkey's Audio 3.99 (insane)</td><td>6:36.65</td><td>6:53.31</td><td>21.22 MB</td><td>0.5427</td></tr>
+			<tr bgcolor="#D4D4C0"><td>Monkey's Audio 3.99 (insane)</td><td>6:36.65</td><td>6:53.31</td><td>21.22 MB</td><td>0.5427</td></tr>
 			<tr><td>optimFROG 4.21 (mode 4 @ 1x)</td><td>16:51.82</td><td>16:54.34</td><td>21.24 MB</td><td>0.5433</td></tr>
-			<tr bgcolor="#D3D4C5"><td>optimFROG 4.21 (mode 1 @ 4x)</td><td>1:14.29</td><td>1:18.06</td><td>21.36 MB</td><td>0.5464</td></tr>
+			<tr bgcolor="#D4D4C0"><td>optimFROG 4.21 (mode 1 @ 4x)</td><td>1:14.29</td><td>1:18.06</td><td>21.36 MB</td><td>0.5464</td></tr>
 			<tr><td>Monkey's Audio 3.99 (extra high)</td><td>1:26.93</td><td>1:31.74</td><td>21.40 MB</td><td>0.5475</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Monkey's Audio 3.99 (high)</td><td>0:47.19</td><td>0:50.45</td><td>21.66 MB</td><td>0.5540</td></tr>
+			<tr bgcolor="#D4D4C0"><td>Monkey's Audio 3.99 (high)</td><td>0:47.19</td><td>0:50.45</td><td>21.66 MB</td><td>0.5540</td></tr>
 			<tr><td>Monkey's Audio 3.99 (normal)</td><td>0:41.57</td><td>0:45.66</td><td>21.76 MB</td><td>0.5565</td></tr>
-			<tr bgcolor="#D3D4C5"><td>optimFROG 4.21 (mode 0 @ 4x)</td><td>0:51.39</td><td>0:54.97</td><td>21.89 MB</td><td>0.5598</td></tr>
+			<tr bgcolor="#D4D4C0"><td>optimFROG 4.21 (mode 0 @ 4x)</td><td>0:51.39</td><td>0:54.97</td><td>21.89 MB</td><td>0.5598</td></tr>
 			<tr><td>Monkey's Audio 3.99 (fast)</td><td>0:31.89</td><td>0:35.92</td><td>22.13 MB</td><td>0.5660</td></tr>
-			<tr bgcolor="#D3D4C5"><td>WavPack 3.97a (high)</td><td>0:45.07</td><td>0:43.88</td><td>22.28 MB</td><td>0.5699</td></tr>
-			<tr><td>WavPack 3.97a (normal)</td><td>0:25.40</td><td>0:24.80</td><td>22.80 MB</td><td>0.5832</td></tr>
-			<tr bgcolor="#D3D4C5"><td>RKAU 1.07 (normal)</td><td>1:21.18</td><td>1:01.60</td><td>22.80 MB</td><td>0.5833</td></tr>
+			<tr bgcolor="#D4D4C0"><td>WavPack 4.31 (high)</td><td>0:43.91</td><td>0:35.37</td><td>22.20 MB</td><td>0.5678</td></tr>
+			<tr><td>WavPack 4.31 (normal -x)</td><td>5:59.96</td><td>0:24.62</td><td>22.77 MB</td><td>0.5825</td></tr>
+			<tr bgcolor="#D4D4C0"><td>RKAU 1.07 (normal)</td><td>1:21.18</td><td>1:01.60</td><td>22.80 MB</td><td>0.5833</td></tr>
+			<tr><td>WavPack 4.31 (normal)</td><td>0:32.29</td><td>0:24.41</td><td>23.15 MB</td><td>0.5921</td></tr>
+			<tr bgcolor="#D4D4C0"><td>flac 1.1.3 (-8)</td><td>2:52.07</td><td>0:23.18</td><td>23.25 MB</td><td>0.5948</td></tr>
 			<tr><td>LPAC 1.40 (-r, normal)</td><td>1:01.11</td><td>0:33.79</td><td>23.25 MB</td><td>0.5948</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Bonk 0.5</td><td>1:53.41</td><td>1:23.52</td><td>23.35 MB</td><td>0.5972</td></tr>
-			<tr><td>flac 1.1.1 (-8)</td><td>2:46.09</td><td>0:23.14</td><td>23.45 MB</td><td>0.5998</td></tr>
-			<tr bgcolor="#FFFFFF"><td>flac 1.1.1 (-5, default)</td><td>0:39.82</td><td>0:21.81</td><td>23.56 MB</td><td>0.6026</td></tr>
-			<tr><td>Apple Lossless</td><td>?</td><td>?</td><td>23.64 MB</td><td>0.6047</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Ogg Squish 0.98</td><td>?</td><td>?</td><td>24.11 MB</td><td>0.6167</td></tr>
-			<tr><td>flac 1.1.1 (-3)</td><td>0:30.58</td><td>0:22.05</td><td>24.32 MB</td><td>0.6221</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Shorten 3.2a (-p8 -b2048)</td><td>0:37.49</td><td>0:22.93</td><td>24.72 MB</td><td>0.6323</td></tr>
-			<tr><td>Kexis 0.2.2</td><td>0:54.26</td><td>0:45.64</td><td>24.80 MB</td><td>0.6345</td></tr>
-			<tr bgcolor="#D3D4C5"><td>flac 1.1.1 (-1)</td><td>0:26.46</td><td>0:22.14</td><td>24.82 MB</td><td>0.6348</td></tr>
-			<tr><td>WavPack 3.97a (fast)</td><td>0:16.67</td><td>0:17.02</td><td>24.94 MB</td><td>0.6381</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Shorten 3.2a (-p0 -b256, default)</td><td>0:29.71</td><td>0:18.92</td><td>25.34 MB</td><td>0.6481</td></tr>
-			<tr><td>WaveZIP</td><td>0:28.05</td><td>?</td><td>25.95 MB</td><td>0.6638</td></tr>
-			<tr bgcolor="#D3D4C5"><td>RIFF WAVE</td><td>3:52.36</td><td>3:52.36</td><td>39.09 MB</td><td>1.0000</td></tr>
+			<tr bgcolor="#D4D4C0"><td>Bonk 0.5</td><td>1:53.41</td><td>1:23.52</td><td>23.35 MB</td><td>0.5972</td></tr>
+			<tr bgcolor="#FFFFFF"><td>flac 1.1.3 (-5, default)</td><td>0:41.34</td><td>0:22.91</td><td>23.39 MB</td><td>0.5983</td></tr>
+			<tr bgcolor="#D4D4C0"><td>Apple Lossless</td><td>?</td><td>?</td><td>23.64 MB</td><td>0.6047</td></tr>
+			<tr><td>Ogg Squish 0.98</td><td>?</td><td>?</td><td>24.11 MB</td><td>0.6167</td></tr>
+			<tr bgcolor="#D4D4C0"><td>flac 1.1.3 (-3)</td><td>0:31.86</td><td>0:21.35</td><td>24.12 MB</td><td>0.6169</td></tr>
+			<tr><td>Shorten 3.2a (-p8 -b2048)</td><td>0:37.49</td><td>0:22.93</td><td>24.72 MB</td><td>0.6323</td></tr>
+			<tr bgcolor="#D4D4C0"><td>flac 1.1.3 (-1)</td><td>0:26.91</td><td>0:23.02</td><td>24.81 MB</td><td>0.6347</td></tr>
+			<tr><td>Shorten 3.2a (-p0 -b256, default)</td><td>0:29.71</td><td>0:18.92</td><td>25.34 MB</td><td>0.6481</td></tr>
+			<tr bgcolor="#D4D4C0"><td>RIFF WAVE</td><td>3:52.36</td><td>3:52.36</td><td>39.09 MB</td><td>1.0000</td></tr>
 			<tr>
 				<td colspan="6" bgcolor="#F4F4CC">&nbsp;</td>
 			</tr>
 			<tr>
-				<td align="right" rowspan="27" bgcolor="#F4F4CC">
+				<td align="right" rowspan="26" bgcolor="#F4F4CC">
 					Gloria Estefan<br /><i>Conga</i>
 				</td>
 			</tr>
-			<!-- bgcolor="#D3D4C5" -->
+			<!-- bgcolor="#D4D4C0" -->
 			<tr><td>La 0.3c</td><td>8:52.93</td><td>8:34.81</td><td>28.98 MB</td><td>0.6419</td></tr>
-			<tr bgcolor="#D3D4C5"><td>optimFROG 4.21 (mode 4 @ 1x)</td><td>19:40.53</td><td>19:44.47</td><td>29.43 MB</td><td>0.6517</td></tr>
+			<tr bgcolor="#D4D4C0"><td>optimFROG 4.21 (mode 4 @ 1x)</td><td>19:40.53</td><td>19:44.47</td><td>29.43 MB</td><td>0.6517</td></tr>
 			<tr><td>Monkey's Audio 3.99 (insane)</td><td>7:41.95</td><td>8:01.95</td><td>29.48 MB</td><td>0.6528</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Monkey's Audio 3.99 (extra high)</td><td>1:42.17</td><td>1:46.62</td><td>29.49 MB</td><td>0.6530</td></tr>
+			<tr bgcolor="#D4D4C0"><td>Monkey's Audio 3.99 (extra high)</td><td>1:42.17</td><td>1:46.62</td><td>29.49 MB</td><td>0.6530</td></tr>
 			<tr><td>optimFROG 4.21 (mode 1 @ 4x)</td><td>1:26.64</td><td>1:32.23</td><td>29.58 MB</td><td>0.6550</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Monkey's Audio 3.99 (high)</td><td>0:57.62</td><td>1:00.74</td><td>29.69 MB</td><td>0.6576</td></tr>
+			<tr bgcolor="#D4D4C0"><td>Monkey's Audio 3.99 (high)</td><td>0:57.62</td><td>1:00.74</td><td>29.69 MB</td><td>0.6576</td></tr>
 			<tr><td>optimFROG 4.21 (mode 0 @ 4x)</td><td>0:59.59</td><td>1:05.29</td><td>29.78 MB</td><td>0.6595</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Monkey's Audio 3.99 (normal)</td><td>0:48.44</td><td>0:53.29</td><td>29.83 MB</td><td>0.6605</td></tr>
-			<tr><td>WavPack 3.97a (high)</td><td>0:53.50</td><td>0:51.90</td><td>29.92 MB</td><td>0.6625</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Monkey's Audio 3.99 (fast)</td><td>0:38.48</td><td>0:43.91</td><td>30.20 MB</td><td>0.6689</td></tr>
-			<tr><td>WavPack 3.97a (normal)</td><td>0:29.84</td><td>0:29.92</td><td>30.28 MB</td><td>0.6706</td></tr>
-			<tr bgcolor="#D3D4C5"><td>RKAU 1.07 (normal)</td><td>1:37.85</td><td>1:12.15</td><td>30.34 MB</td><td>0.6719</td></tr>
-			<tr><td>Bonk 0.5</td><td>2:13.34</td><td>1:39.44</td><td>30.64 MB</td><td>0.6785</td></tr>
-			<tr bgcolor="#D3D4C5"><td>flac 1.1.1 (-8)</td><td>3:16.07</td><td>0:27.53</td><td>30.76 MB</td><td>0.6811</td></tr>
+			<tr bgcolor="#D4D4C0"><td>Monkey's Audio 3.99 (normal)</td><td>0:48.44</td><td>0:53.29</td><td>29.83 MB</td><td>0.6605</td></tr>
+			<tr><td>WavPack 4.31 (high)</td><td>0:50.91</td><td>0:42.08</td><td>29.94 MB</td><td>0.6630</td></tr>
+			<tr bgcolor="#D4D4C0"><td>Monkey's Audio 3.99 (fast)</td><td>0:38.48</td><td>0:43.91</td><td>30.20 MB</td><td>0.6689</td></tr>
+			<tr><td>WavPack 4.31 (normal -x)</td><td>7:12.86</td><td>0:29.85</td><td>30.25 MB</td><td>0.6698</td></tr>
+			<tr bgcolor="#D4D4C0"><td>RKAU 1.07 (normal)</td><td>1:37.85</td><td>1:12.15</td><td>30.34 MB</td><td>0.6719</td></tr>
+			<tr><td>WavPack 4.31 (normal)</td><td>0:36.68</td><td>0:29.29</td><td>30.35 MB</td><td>0.6722</td></tr>
+			<tr bgcolor="#D4D4C0"><td>Bonk 0.5</td><td>2:13.34</td><td>1:39.44</td><td>30.64 MB</td><td>0.6785</td></tr>
+			<tr><td>flac 1.1.3 (-8)</td><td>3:21.71</td><td>0:26.90</td><td>30.69 MB</td><td>0.6798</td></tr>
+			<tr bgcolor="#FFFFFF"><td>flac 1.1.3 (-5, default)</td><td>0:48.07</td><td>0:27.36</td><td>30.80 MB</td><td>0.6822</td></tr>
 			<tr><td>LPAC 1.40 (-r, normal)</td><td>1:14.08</td><td>0:44.64</td><td>30.81 MB</td><td>0.6823</td></tr>
-			<tr bgcolor="#FFFFFF"><td>flac 1.1.1 (-5, default)</td><td>0:46.30</td><td>0:26.74</td><td>30.86 MB</td><td>0.6834</td></tr>
-			<tr><td>Apple Lossless</td><td>?</td><td>?</td><td>30.91 MB</td><td>0.6847</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Ogg Squish 0.98</td><td>?</td><td>?</td><td>31.06 MB</td><td>0.6879</td></tr>
-			<tr><td>WavPack 3.97a (fast)</td><td>0:13.31</td><td>0:14.15</td><td>31.61 MB</td><td>0.7000</td></tr>
-			<tr bgcolor="#D3D4C5"><td>flac 1.1.1 (-3)</td><td>0:35.88</td><td>0:27.65</td><td>31.63 MB</td><td>0.7006</td></tr>
+			<tr bgcolor="#D4D4C0"><td>Apple Lossless</td><td>?</td><td>?</td><td>30.91 MB</td><td>0.6847</td></tr>
+			<tr><td>Ogg Squish 0.98</td><td>?</td><td>?</td><td>31.06 MB</td><td>0.6879</td></tr>
+			<tr bgcolor="#D4D4C0"><td>flac 1.1.3 (-3)</td><td>0:36.23</td><td>0:25.76</td><td>31.58 MB</td><td>0.6994</td></tr>
 			<tr><td>Shorten 3.2a (-p8 -b2048)</td><td>0:44.76</td><td>0:27.48</td><td>31.76 MB</td><td>0.7034</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Kexis 0.2.2</td><td>1:03.91</td><td>0:53.54</td><td>31.86 MB</td><td>0.7056</td></tr>
-			<tr><td>flac 1.1.1 (-1)</td><td>0:32.51</td><td>0:27.30</td><td>31.99 MB</td><td>0.7085</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Shorten 3.2a (-p0 -b256, default)</td><td>0:35.74</td><td>0:23.64</td><td>32.47 MB</td><td>0.7191</td></tr>
-			<tr><td>WaveZIP</td><td>0:29.42</td><td>?</td><td>33.02 MB</td><td>0.7313</td></tr>
-			<tr bgcolor="#D3D4C5"><td>RIFF WAVE</td><td>4:28.39</td><td>4:28.39</td><td>45.15 MB</td><td>1.0000</td></tr>
+			<tr bgcolor="#D4D4C0"><td>flac 1.1.3 (-1)</td><td>0:31.07</td><td>0:27.52</td><td>31.99 MB</td><td>0.7084</td></tr>
+			<tr><td>Shorten 3.2a (-p0 -b256, default)</td><td>0:35.74</td><td>0:23.64</td><td>32.47 MB</td><td>0.7191</td></tr>
+			<tr bgcolor="#D4D4C0"><td>RIFF WAVE</td><td>4:28.39</td><td>4:28.39</td><td>45.15 MB</td><td>1.0000</td></tr>
 			<tr>
 				<td colspan="6" bgcolor="#F4F4CC">&nbsp;</td>
 			</tr>
 			<tr>
-				<td align="right" rowspan="27" bgcolor="#F4F4CC">
+				<td align="right" rowspan="26" bgcolor="#F4F4CC">
 					Cream<br /><i>White Room</i>
 				</td>
 			</tr>
-			<!-- bgcolor="#D3D4C5" -->
+			<!-- bgcolor="#D4D4C0" -->
 			<tr><td>La 0.3c</td><td>10:24.08</td><td>10:03.16</td><td>33.44 MB</td><td>0.6309</td></tr>
-			<tr bgcolor="#D3D4C5"><td>optimFROG 4.21 (mode 4 @ 1x)</td><td>22:59.05</td><td>23:02.98</td><td>33.93 MB</td><td>0.6399</td></tr>
+			<tr bgcolor="#D4D4C0"><td>optimFROG 4.21 (mode 4 @ 1x)</td><td>22:59.05</td><td>23:02.98</td><td>33.93 MB</td><td>0.6399</td></tr>
 			<tr><td>Monkey's Audio 3.99 (insane)</td><td>9:02.77</td><td>9:26.75</td><td>33.95 MB</td><td>0.6404</td></tr>
-			<tr bgcolor="#D3D4C5"><td>optimFROG 4.21 (mode 1 @ 4x)</td><td>1:42.28</td><td>1:47.55</td><td>33.96 MB</td><td>0.6405</td></tr>
+			<tr bgcolor="#D4D4C0"><td>optimFROG 4.21 (mode 1 @ 4x)</td><td>1:42.28</td><td>1:47.55</td><td>33.96 MB</td><td>0.6405</td></tr>
 			<tr><td>Monkey's Audio 3.99 (extra high)</td><td>1:59.73</td><td>2:04.46</td><td>34.00 MB</td><td>0.6413</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Monkey's Audio 3.99 (high)</td><td>1:05.80</td><td>1:09.38</td><td>34.11 MB</td><td>0.6435</td></tr>
+			<tr bgcolor="#D4D4C0"><td>Monkey's Audio 3.99 (high)</td><td>1:05.80</td><td>1:09.38</td><td>34.11 MB</td><td>0.6435</td></tr>
 			<tr><td>Monkey's Audio 3.99 (normal)</td><td>0:56.67</td><td>0:59.56</td><td>34.25 MB</td><td>0.6460</td></tr>
-			<tr bgcolor="#D3D4C5"><td>optimFROG 4.21 (mode 0 @ 4x)</td><td>1:10.30</td><td>1:15.99</td><td>34.29 MB</td><td>0.6468</td></tr>
-			<tr><td>WavPack 3.97a (high)</td><td>0:51.50</td><td>1:02.71</td><td>34.55 MB</td><td>0.6516</td></tr>
-			<tr bgcolor="#D3D4C5"><td>RKAU 1.07 (normal)</td><td>1:50.80</td><td>1:24.98</td><td>34.60 MB</td><td>0.6527</td></tr>
+			<tr bgcolor="#D4D4C0"><td>optimFROG 4.21 (mode 0 @ 4x)</td><td>1:10.30</td><td>1:15.99</td><td>34.29 MB</td><td>0.6468</td></tr>
+			<tr><td>WavPack 4.31 (high)</td><td>1:00.48</td><td>0:49.80</td><td>34.60 MB</td><td>0.6527</td></tr>
+			<tr bgcolor="#D4D4C0"><td>RKAU 1.07 (normal)</td><td>1:50.80</td><td>1:24.98</td><td>34.60 MB</td><td>0.6527</td></tr>
 			<tr><td>LPAC 1.40 (-r, normal)</td><td>1:25.16</td><td>0:48.67</td><td>34.84 MB</td><td>0.6572</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Monkey's Audio 3.99 (fast)</td><td>0:44.60</td><td>0:48.92</td><td>34.85 MB</td><td>0.6574</td></tr>
+			<tr bgcolor="#D4D4C0"><td>Monkey's Audio 3.99 (fast)</td><td>0:44.60</td><td>0:48.92</td><td>34.85 MB</td><td>0.6574</td></tr>
+			<tr><td>flac 1.1.3 (-8)</td><td>3:55.63</td><td>0:31.87</td><td>34.89 MB</td><td>0.6581</td></tr>
+			<tr bgcolor="#D4D4C0"><td>WavPack 4.31 (normal -x)</td><td>8:41.25</td><td>0:34.33</td><td>34.89 MB</td><td>0.6581</td></tr>
 			<tr><td>Bonk 0.5</td><td>2:35.36</td><td>1:56.20</td><td>34.96 MB</td><td>0.6595</td></tr>
-			<tr bgcolor="#D3D4C5"><td>flac 1.1.1 (-8)</td><td>3:48.73</td><td>0:31.91</td><td>34.99 MB</td><td>0.6601</td></tr>
-			<tr><td>WavPack 3.97a (normal)</td><td>0:24.43</td><td>0:36.09</td><td>35.08 MB</td><td>0.6617</td></tr>
-			<tr bgcolor="#FFFFFF"><td>flac 1.1.1 (-5, default)</td><td>0:54.89</td><td>0:33.82</td><td>35.16 MB</td><td>0.6633</td></tr>
-			<tr><td>flac 1.1.1 (-3)</td><td>0:41.38</td><td>0:32.00</td><td>35.36 MB</td><td>0.6671</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Shorten 3.2a (-p8 -b2048)</td><td>0:51.44</td><td>0:33.02</td><td>35.40 MB</td><td>0.6677</td></tr>
-			<tr><td>Apple Lossless</td><td>?</td><td>?</td><td>35.46 MB</td><td>0.6689</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Ogg Squish 0.98</td><td>?</td><td>?</td><td>35.74 MB</td><td>0.6742</td></tr>
-			<tr><td>WavPack 3.97a (fast)</td><td>0:26.00</td><td>0:24.83</td><td>36.32 MB</td><td>0.6852</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Shorten 3.2a (-p0 -b256, default)</td><td>0:41.14</td><td>0:28.91</td><td>36.42 MB</td><td>0.6870</td></tr>
-			<tr><td>flac 1.1.1 (-1)</td><td>0:36.87</td><td>0:33.39</td><td>36.56 MB</td><td>0.6897</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Kexis 0.2.2</td><td>1:13.87</td><td>1:02.90</td><td>36.64 MB</td><td>0.6911</td></tr>
-			<tr><td>WaveZIP</td><td>0:35.77</td><td>?</td><td>37.13 MB</td><td>0.7004</td></tr>
-			<tr bgcolor="#D3D4C5"><td>RIFF WAVE</td><td>5:15.11</td><td>5:15.11</td><td>53.01 MB</td><td>1.0000</td></tr>
+			<tr bgcolor="#FFFFFF"><td>flac 1.1.3 (-5, default)</td><td>0:56.73</td><td>0:31.17</td><td>35.12 MB</td><td>0.6624</td></tr>
+			<tr><td>WavPack 4.31 (normal)</td><td>0:43.06</td><td>0:34.90</td><td>35.14 MB</td><td>0.6628</td></tr>
+			<tr bgcolor="#D4D4C0"><td>flac 1.1.3 (-3)</td><td>0:43.05</td><td>0:30.95</td><td>35.34 MB</td><td>0.6665</td></tr>
+			<tr><td>Shorten 3.2a (-p8 -b2048)</td><td>0:51.44</td><td>0:33.02</td><td>35.40 MB</td><td>0.6677</td></tr>
+			<tr bgcolor="#D4D4C0"><td>Apple Lossless</td><td>?</td><td>?</td><td>35.46 MB</td><td>0.6689</td></tr>
+			<tr><td>Ogg Squish 0.98</td><td>?</td><td>?</td><td>35.74 MB</td><td>0.6742</td></tr>
+			<tr bgcolor="#D4D4C0"><td>Shorten 3.2a (-p0 -b256, default)</td><td>0:41.14</td><td>0:28.91</td><td>36.42 MB</td><td>0.6870</td></tr>
+			<tr><td>flac 1.1.3 (-1)</td><td>0:35.55</td><td>0:30.18</td><td>36.56 MB</td><td>0.6896</td></tr>
+			<tr bgcolor="#D4D4C0"><td>RIFF WAVE</td><td>5:15.11</td><td>5:15.11</td><td>53.01 MB</td><td>1.0000</td></tr>
 			<tr>
 				<td colspan="6" bgcolor="#F4F4CC">&nbsp;</td>
 			</tr>
 			<tr>
-				<td align="right" rowspan="27" bgcolor="#F4F4CC">
+				<td align="right" rowspan="26" bgcolor="#F4F4CC">
 					Maurice Ravel<br /><i>Fanfare from "L'eventail de Jeanne"</i>
 				</td>
 			</tr>
-			<!-- bgcolor="#D3D4C5" -->
+			<!-- bgcolor="#D4D4C0" -->
 			<tr><td>La 0.3c</td><td>3:55.40</td><td>3:47.60</td><td>6.46 MB</td><td>0.3104</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Monkey's Audio 3.99 (extra high)</td><td>0:42.68</td><td>0:43.98</td><td>6.75 MB</td><td>0.3243</td></tr>
+			<tr bgcolor="#D4D4C0"><td>Monkey's Audio 3.99 (extra high)</td><td>0:42.68</td><td>0:43.98</td><td>6.75 MB</td><td>0.3243</td></tr>
 			<tr><td>Monkey's Audio 3.99 (insane)</td><td>3:10.93</td><td>3:18.53</td><td>6.78 MB</td><td>0.3256</td></tr>
-			<tr bgcolor="#D3D4C5"><td>optimFROG 4.21 (mode 4 @ 1x)</td><td>8:22.42</td><td>8:23.32</td><td>6.82 MB</td><td>0.3274</td></tr>
+			<tr bgcolor="#D4D4C0"><td>optimFROG 4.21 (mode 4 @ 1x)</td><td>8:22.42</td><td>8:23.32</td><td>6.82 MB</td><td>0.3274</td></tr>
 			<tr><td>Monkey's Audio 3.99 (high)</td><td>0:23.09</td><td>0:24.12</td><td>6.98 MB</td><td>0.3353</td></tr>
-			<tr bgcolor="#D3D4C5"><td>optimFROG 4.21 (mode 1 @ 4x)</td><td>0:36.57</td><td>0:38.26</td><td>7.09 MB</td><td>0.3406</td></tr>
+			<tr bgcolor="#D4D4C0"><td>optimFROG 4.21 (mode 1 @ 4x)</td><td>0:36.57</td><td>0:38.26</td><td>7.09 MB</td><td>0.3406</td></tr>
 			<tr><td>RKAU 1.07 (normal)</td><td>0:40.67</td><td>0:28.52</td><td>7.18 MB</td><td>0.3451</td></tr>
-			<tr bgcolor="#D3D4C5"><td>optimFROG 4.21 (mode 0 @ 4x)</td><td>0:24.98</td><td>0:26.37</td><td>7.21 MB</td><td>0.3462</td></tr>
+			<tr bgcolor="#D4D4C0"><td>optimFROG 4.21 (mode 0 @ 4x)</td><td>0:24.98</td><td>0:26.37</td><td>7.21 MB</td><td>0.3462</td></tr>
 			<tr><td>Monkey's Audio 3.99 (normal)</td><td>0:19.78</td><td>0:20.50</td><td>7.28 MB</td><td>0.3495</td></tr>
-			<tr bgcolor="#D3D4C5"><td>LPAC 1.40 (-r, normal)</td><td>0:29.01</td><td>0:15.11</td><td>7.33 MB</td><td>0.3520</td></tr>
-			<tr><td>WavPack 3.97a (high)</td><td>0:22.63</td><td>0:21.86</td><td>7.45 MB</td><td>0.3577</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Monkey's Audio 3.99 (fast)</td><td>0:15.60</td><td>0:16.76</td><td>7.50 MB</td><td>0.3601</td></tr>
-			<tr><td>flac 1.1.1 (-8)</td><td>1:20.73</td><td>0:09.51</td><td>7.69 MB</td><td>0.3692</td></tr>
-			<tr bgcolor="#FFFFFF"><td>flac 1.1.1 (-5, default)</td><td>0:18.95</td><td>0:09.45</td><td>7.71 MB</td><td>0.3703</td></tr>
-			<tr><td>flac 1.1.1 (-3)</td><td>0:14.98</td><td>0:09.19</td><td>7.77 MB</td><td>0.3734</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Apple Lossless</td><td>?</td><td>?</td><td>7.82 MB</td><td>0.3757</td></tr>
-			<tr><td>WavPack 3.97a (normal)</td><td>0:12.56</td><td>0:11.95</td><td>7.83 MB</td><td>0.3760</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Bonk 0.5</td><td>0:55.92</td><td>0:40.23</td><td>7.83 MB</td><td>0.3762</td></tr>
-			<tr><td>flac 1.1.1 (-1)</td><td>0:12.97</td><td>0:10.39</td><td>8.12 MB</td><td>0.3902</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Ogg Squish 0.98</td><td>?</td><td>?</td><td>8.15 MB</td><td>0.3914</td></tr>
-			<tr><td>Shorten 3.2a (-p0 -b256, default)</td><td>0:13.81</td><td>0:08.88</td><td>8.19 MB</td><td>0.3932</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Shorten 3.2a (-p8 -b2048)</td><td>0:17.45</td><td>0:10.30</td><td>8.29 MB</td><td>0.3983</td></tr>
-			<tr><td>Kexis 0.2.2</td><td>0:26.78</td><td>0:21.90</td><td>8.52 MB</td><td>0.4091</td></tr>
-			<tr bgcolor="#D3D4C5"><td>WaveZIP</td><td>0:13.11</td><td>?</td><td>8.72 MB</td><td>0.4193</td></tr>
-			<tr><td>WavPack 3.97a (fast)</td><td>0:05.35</td><td>0:06.33</td><td>8.87 MB</td><td>0.4259</td></tr>
-			<tr bgcolor="#D3D4C5"><td>RIFF WAVE</td><td>2:03.76</td><td>2:03.76</td><td>20.82 MB</td><td>1.0000</td></tr>
+			<tr bgcolor="#D4D4C0"><td>LPAC 1.40 (-r, normal)</td><td>0:29.01</td><td>0:15.11</td><td>7.33 MB</td><td>0.3520</td></tr>
+			<tr><td>WavPack 4.31 (high)</td><td>0:22.05</td><td>0:17.19</td><td>7.44 MB</td><td>0.3576</td></tr>
+			<tr bgcolor="#D4D4C0"><td>WavPack 4.31 (normal -x)</td><td>2:53.15</td><td>0:10.76</td><td>7.46 MB</td><td>0.3585</td></tr>
+			<tr><td>Monkey's Audio 3.99 (fast)</td><td>0:15.60</td><td>0:16.76</td><td>7.50 MB</td><td>0.3601</td></tr>
+			<tr bgcolor="#D4D4C0"><td>flac 1.1.3 (-8)</td><td>1:22.00</td><td>0:09.56</td><td>7.54 MB</td><td>0.3623</td></tr>
+			<tr bgcolor="#FFFFFF"><td>flac 1.1.3 (-5, default)</td><td>0:19.85</td><td>0:09.31</td><td>7.61 MB</td><td>0.3656</td></tr>
+			<tr bgcolor="#D4D4C0"><td>flac 1.1.3 (-3)</td><td>0:14.76</td><td>0:08.83</td><td>7.67 MB</td><td>0.3684</td></tr>
+			<tr><td>WavPack 4.31 (normal)</td><td>0:15.39</td><td>0:11.41</td><td>7.68 MB</td><td>0.3691</td></tr>
+			<tr bgcolor="#D4D4C0"><td>Apple Lossless</td><td>?</td><td>?</td><td>7.82 MB</td><td>0.3757</td></tr>
+			<tr><td>Bonk 0.5</td><td>0:55.92</td><td>0:40.23</td><td>7.83 MB</td><td>0.3762</td></tr>
+			<tr bgcolor="#D4D4C0"><td>flac 1.1.3 (-1)</td><td>0:12.15</td><td>0:09.58</td><td>8.12 MB</td><td>0.3900</td></tr>
+			<tr><td>Ogg Squish 0.98</td><td>?</td><td>?</td><td>8.15 MB</td><td>0.3914</td></tr>
+			<tr bgcolor="#D4D4C0"><td>Shorten 3.2a (-p0 -b256, default)</td><td>0:13.81</td><td>0:08.88</td><td>8.19 MB</td><td>0.3932</td></tr>
+			<tr><td>Shorten 3.2a (-p8 -b2048)</td><td>0:17.45</td><td>0:10.30</td><td>8.29 MB</td><td>0.3983</td></tr>
+			<tr bgcolor="#D4D4C0"><td>RIFF WAVE</td><td>2:03.76</td><td>2:03.76</td><td>20.82 MB</td><td>1.0000</td></tr>
 			<tr>
 				<td colspan="6" bgcolor="#F4F4CC">&nbsp;</td>
 			</tr>
 			<tr>
-				<td align="right" rowspan="27" bgcolor="#F4F4CC">
+				<td align="right" rowspan="26" bgcolor="#F4F4CC">
 					Maurice Ravel<br /><i>String Quartet (4th movement)</i>
 				</td>
 			</tr>
-			<!-- bgcolor="#D3D4C5" -->
+			<!-- bgcolor="#D4D4C0" -->
 			<tr><td>La 0.3c</td><td>10:45.80</td><td>10:21.44</td><td>19.94 MB</td><td>0.3550</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Monkey's Audio 3.99 (insane)</td><td>9:17.64</td><td>9:43.03</td><td>20.17 MB</td><td>0.3590</td></tr>
+			<tr bgcolor="#D4D4C0"><td>Monkey's Audio 3.99 (insane)</td><td>9:17.64</td><td>9:43.03</td><td>20.17 MB</td><td>0.3590</td></tr>
 			<tr><td>Monkey's Audio 3.99 (extra high)</td><td>2:01.23</td><td>2:06.97</td><td>20.29 MB</td><td>0.3611</td></tr>
-			<tr bgcolor="#D3D4C5"><td>optimFROG 4.21 (mode 4 @ 1x)</td><td>24:26.99</td><td>24:29.36</td><td>20.62 MB</td><td>0.3671</td></tr>
+			<tr bgcolor="#D4D4C0"><td>optimFROG 4.21 (mode 4 @ 1x)</td><td>24:26.99</td><td>24:29.36</td><td>20.62 MB</td><td>0.3671</td></tr>
 			<tr><td>Monkey's Audio 3.99 (high)</td><td>1:06.28</td><td>1:09.59</td><td>20.68 MB</td><td>0.3681</td></tr>
-			<tr bgcolor="#D3D4C5"><td>optimFROG 4.21 (mode 1 @ 4x)</td><td>1:42.57</td><td>1:47.48</td><td>20.93 MB</td><td>0.3725</td></tr>
+			<tr bgcolor="#D4D4C0"><td>optimFROG 4.21 (mode 1 @ 4x)</td><td>1:42.57</td><td>1:47.48</td><td>20.93 MB</td><td>0.3725</td></tr>
 			<tr><td>Monkey's Audio 3.99 (normal)</td><td>0:56.22</td><td>1:01.22</td><td>21.05 MB</td><td>0.3747</td></tr>
-			<tr bgcolor="#D3D4C5"><td>optimFROG 4.21 (mode 0 @ 4x)</td><td>1:09.17</td><td>1:13.14</td><td>21.23 MB</td><td>0.3779</td></tr>
+			<tr bgcolor="#D4D4C0"><td>optimFROG 4.21 (mode 0 @ 4x)</td><td>1:09.17</td><td>1:13.14</td><td>21.23 MB</td><td>0.3779</td></tr>
 			<tr><td>RKAU 1.07 (normal)</td><td>1:52.65</td><td>1:25.39</td><td>21.30 MB</td><td>0.3791</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Monkey's Audio 3.99 (fast)</td><td>0:43.69</td><td>0:49.31</td><td>21.52 MB</td><td>0.3830</td></tr>
-			<tr><td>WavPack 3.97a (high)</td><td>0:52.48</td><td>1:02.26</td><td>21.55 MB</td><td>0.3835</td></tr>
-			<tr bgcolor="#D3D4C5"><td>LPAC 1.40 (-r, normal)</td><td>1:20.84</td><td>0:42.73</td><td>21.96 MB</td><td>0.3909</td></tr>
-			<tr><td>WavPack 3.97a (normal)</td><td>0:23.29</td><td>0:34.28</td><td>22.11 MB</td><td>0.3935</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Apple Lossless</td><td>?</td><td>?</td><td>22.52 MB</td><td>0.4008</td></tr>
-			<tr><td>flac 1.1.1 (-8)</td><td>3:53.93</td><td>0:28.02</td><td>22.61 MB</td><td>0.4025</td></tr>
-			<tr bgcolor="#FFFFFF"><td>flac 1.1.1 (-5, default)</td><td>0:54.34</td><td>0:27.92</td><td>22.68 MB</td><td>0.4036</td></tr>
+			<tr bgcolor="#D4D4C0"><td>WavPack 4.31 (high)</td><td>1:02.94</td><td>0:48.07</td><td>21.50 MB</td><td>0.3826</td></tr>
+			<tr><td>Monkey's Audio 3.99 (fast)</td><td>0:43.69</td><td>0:49.31</td><td>21.52 MB</td><td>0.3830</td></tr>
+			<tr bgcolor="#D4D4C0"><td>WavPack 4.31 (normal -x)</td><td>8:59.42</td><td>0:30.73</td><td>21.64 MB</td><td>0.3852</td></tr>
+			<tr><td>flac 1.1.3 (-8)</td><td>3:59.35</td><td>0:27.13</td><td>21.96 MB</td><td>0.3909</td></tr>
+			<tr bgcolor="#D4D4C0"><td>LPAC 1.40 (-r, normal)</td><td>1:20.84</td><td>0:42.73</td><td>21.96 MB</td><td>0.3909</td></tr>
+			<tr><td>WavPack 4.31 (normal)</td><td>0:42.72</td><td>0:31.82</td><td>22.00 MB</td><td>0.3916</td></tr>
+			<tr bgcolor="#FFFFFF"><td>flac 1.1.3 (-5, default)</td><td>0:56.39</td><td>0:27.81</td><td>22.21 MB</td><td>0.3953</td></tr>
+			<tr><td>Apple Lossless</td><td>?</td><td>?</td><td>22.52 MB</td><td>0.4008</td></tr>
+			<tr bgcolor="#D4D4C0"><td>flac 1.1.3 (-3)</td><td>0:41.78</td><td>0:26.42</td><td>22.69 MB</td><td>0.4038</td></tr>
 			<tr><td>Bonk 0.5</td><td>2:33.53</td><td>1:51.94</td><td>23.18 MB</td><td>0.4125</td></tr>
-			<tr bgcolor="#D3D4C5"><td>flac 1.1.1 (-3)</td><td>0:40.00</td><td>0:28.15</td><td>23.21 MB</td><td>0.4132</td></tr>
-			<tr><td>flac 1.1.1 (-1)</td><td>0:34.99</td><td>0:27.73</td><td>23.36 MB</td><td>0.4158</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Kexis 0.2.2</td><td>1:15.05</td><td>1:03.86</td><td>23.42 MB</td><td>0.4168</td></tr>
+			<tr bgcolor="#D4D4C0"><td>flac 1.1.3 (-1)</td><td>0:34.22</td><td>0:27.52</td><td>23.36 MB</td><td>0.4157</td></tr>
 			<tr><td>Shorten 3.2a (-p0 -b256, default)</td><td>0:39.96</td><td>0:27.36</td><td>23.71 MB</td><td>0.4221</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Ogg Squish 0.98</td><td>?</td><td>?</td><td>24.12 MB</td><td>0.4293</td></tr>
-			<tr><td>WavPack 3.97a (fast)</td><td>0:24.34</td><td>0:22.17</td><td>25.08 MB</td><td>0.4463</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Shorten 3.2a (-p8 -b2048)</td><td>0:49.06</td><td>0:29.94</td><td>25.59 MB</td><td>0.4554</td></tr>
-			<tr><td>WaveZIP</td><td>0:36.60</td><td>?</td><td>25.84 MB</td><td>0.4600</td></tr>
-			<tr bgcolor="#D3D4C5"><td>RIFF WAVE</td><td>5:33.95</td><td>5:33.95</td><td>56.18 MB</td><td>1.0000</td></tr>
+			<tr bgcolor="#D4D4C0"><td>Ogg Squish 0.98</td><td>?</td><td>?</td><td>24.12 MB</td><td>0.4293</td></tr>
+			<tr><td>Shorten 3.2a (-p8 -b2048)</td><td>0:49.06</td><td>0:29.94</td><td>25.59 MB</td><td>0.4554</td></tr>
+			<tr bgcolor="#D4D4C0"><td>RIFF WAVE</td><td>5:33.95</td><td>5:33.95</td><td>56.18 MB</td><td>1.0000</td></tr>
 			<tr>
 				<td colspan="6" bgcolor="#F4F4CC">&nbsp;</td>
 			</tr>
 			<tr>
-				<td align="right" rowspan="27" bgcolor="#F4F4CC">
+				<td align="right" rowspan="26" bgcolor="#F4F4CC">
 					Sergei Prokofiev<br /><i>Piano Concerto No.3 (3rd movement)</i>
 				</td>
 			</tr>
-			<!-- bgcolor="#D3D4C5" -->
+			<!-- bgcolor="#D4D4C0" -->
 			<tr><td>La 0.3c</td><td>19:11.61</td><td>18:28.80</td><td>32.65 MB</td><td>0.3243</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Monkey's Audio 3.99 (insane)</td><td>16:21.16</td><td>17:04.46</td><td>33.34 MB</td><td>0.3311</td></tr>
+			<tr bgcolor="#D4D4C0"><td>Monkey's Audio 3.99 (insane)</td><td>16:21.16</td><td>17:04.46</td><td>33.34 MB</td><td>0.3311</td></tr>
 			<tr><td>optimFROG 4.21 (mode 4 @ 1x)</td><td>43:21.88</td><td>43:26.18</td><td>33.58 MB</td><td>0.3335</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Monkey's Audio 3.99 (extra high)</td><td>3:34.86</td><td>3:46.82</td><td>33.60 MB</td><td>0.3337</td></tr>
+			<tr bgcolor="#D4D4C0"><td>Monkey's Audio 3.99 (extra high)</td><td>3:34.86</td><td>3:46.82</td><td>33.60 MB</td><td>0.3337</td></tr>
 			<tr><td>optimFROG 4.21 (mode 1 @ 4x)</td><td>3:00.57</td><td>3:08.19</td><td>33.83 MB</td><td>0.3360</td></tr>
-			<tr bgcolor="#D3D4C5"><td>optimFROG 4.21 (mode 0 @ 4x)</td><td>2:00.85</td><td>2:09.52</td><td>34.14 MB</td><td>0.3390</td></tr>
+			<tr bgcolor="#D4D4C0"><td>optimFROG 4.21 (mode 0 @ 4x)</td><td>2:00.85</td><td>2:09.52</td><td>34.14 MB</td><td>0.3390</td></tr>
 			<tr><td>Monkey's Audio 3.99 (high)</td><td>1:56.68</td><td>2:07.25</td><td>34.16 MB</td><td>0.3392</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Monkey's Audio 3.99 (normal)</td><td>1:38.96</td><td>1:48.17</td><td>34.58 MB</td><td>0.3434</td></tr>
-			<tr><td>RKAU 1.07 (normal)</td><td>3:08.70</td><td>2:26.17</td><td>35.21 MB</td><td>0.3496</td></tr>
-			<tr bgcolor="#D3D4C5"><td>LPAC 1.40 (-r, normal)</td><td>2:06.21</td><td>1:11.92</td><td>35.27 MB</td><td>0.3502</td></tr>
-			<tr><td>WavPack 3.97a (high)</td><td>1:32.78</td><td>1:50.74</td><td>35.35 MB</td><td>0.3510</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Monkey's Audio 3.99 (fast)</td><td>1:17.00</td><td>1:27.35</td><td>35.53 MB</td><td>0.3528</td></tr>
-			<tr><td>WavPack 3.97a (normal)</td><td>0:40.68</td><td>1:00.29</td><td>36.99 MB</td><td>0.3673</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Apple Lossless</td><td>?</td><td>?</td><td>37.32 MB</td><td>0.3706</td></tr>
-			<tr><td>flac 1.1.1 (-8)</td><td>6:51.48</td><td>0:49.47</td><td>38.07 MB</td><td>0.3781</td></tr>
-			<tr bgcolor="#FFFFFF"><td>flac 1.1.1 (-5, default)</td><td>1:35.22</td><td>0:47.57</td><td>38.17 MB</td><td>0.3791</td></tr>
-			<tr><td>flac 1.1.1 (-3)</td><td>1:10.67</td><td>0:46.40</td><td>38.51 MB</td><td>0.3824</td></tr>
-			<tr bgcolor="#D3D4C5"><td>flac 1.1.1 (-1)</td><td>1:01.44</td><td>0:53.40</td><td>39.30 MB</td><td>0.3903</td></tr>
-			<tr><td>Shorten 3.2a (-p0 -b256, default)</td><td>1:10.57</td><td>0:50.00</td><td>39.49 MB</td><td>0.3921</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Kexis 0.2.2</td><td>2:12.39</td><td>1:49.00</td><td>39.89 MB</td><td>0.3962</td></tr>
+			<tr bgcolor="#D4D4C0"><td>Monkey's Audio 3.99 (normal)</td><td>1:38.96</td><td>1:48.17</td><td>34.58 MB</td><td>0.3434</td></tr>
+			<tr><td>WavPack 4.31 (normal -x)</td><td>15:52.28</td><td>0:54.44</td><td>35.16 MB</td><td>0.3491</td></tr>
+			<tr bgcolor="#D4D4C0"><td>RKAU 1.07 (normal)</td><td>3:08.70</td><td>2:26.17</td><td>35.21 MB</td><td>0.3496</td></tr>
+			<tr><td>WavPack 4.31 (high)</td><td>1:52.56</td><td>1:26.32</td><td>35.22 MB</td><td>0.3497</td></tr>
+			<tr bgcolor="#D4D4C0"><td>LPAC 1.40 (-r, normal)</td><td>2:06.21</td><td>1:11.92</td><td>35.27 MB</td><td>0.3502</td></tr>
+			<tr><td>Monkey's Audio 3.99 (fast)</td><td>1:17.00</td><td>1:27.35</td><td>35.53 MB</td><td>0.3528</td></tr>
+			<tr bgcolor="#D4D4C0"><td>flac 1.1.3 (-8)</td><td>6:49.78</td><td>0:48.11</td><td>36.74 MB</td><td>0.3648</td></tr>
+			<tr><td>WavPack 4.31 (normal)</td><td>1:16.89</td><td>0:56.75</td><td>36.99 MB</td><td>0.3673</td></tr>
+			<tr bgcolor="#D4D4C0"><td>Apple Lossless</td><td>?</td><td>?</td><td>37.32 MB</td><td>0.3706</td></tr>
+			<tr bgcolor="#FFFFFF"><td>flac 1.1.3 (-5, default)</td><td>1:41.23</td><td>0:48.70</td><td>37.38 MB</td><td>0.3713</td></tr>
+			<tr bgcolor="#D4D4C0"><td>flac 1.1.3 (-3)</td><td>1:14.42</td><td>0:45.92</td><td>37.62 MB</td><td>0.3736</td></tr>
+			<tr><td>flac 1.1.3 (-1)</td><td>1:02.03</td><td>0:50.48</td><td>39.30 MB</td><td>0.3903</td></tr>
+			<tr bgcolor="#D4D4C0"><td>Shorten 3.2a (-p0 -b256, default)</td><td>1:10.57</td><td>0:50.00</td><td>39.49 MB</td><td>0.3921</td></tr>
 			<tr><td>Bonk 0.5</td><td>4:33.71</td><td>3:19.38</td><td>40.31 MB</td><td>0.4003</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Ogg Squish 0.98</td><td>?</td><td>?</td><td>41.86 MB</td><td>0.4157</td></tr>
-			<tr><td>WavPack 3.97a (fast)</td><td>0:43.24</td><td>0:40.17</td><td>43.03 MB</td><td>0.4273</td></tr>
-			<tr bgcolor="#D3D4C5"><td>WaveZIP</td><td>1:05.60</td><td>?</td><td>43.67 MB</td><td>0.4337</td></tr>
+			<tr bgcolor="#D4D4C0"><td>Ogg Squish 0.98</td><td>?</td><td>?</td><td>41.86 MB</td><td>0.4157</td></tr>
 			<tr><td>Shorten 3.2a (-p8 -b2048)</td><td>1:26.84</td><td>0:53.19</td><td>45.34 MB</td><td>0.4502</td></tr>
-			<tr bgcolor="#D3D4C5"><td>RIFF WAVE</td><td>9:58.47</td><td>9:58.47</td><td>100.68 MB</td><td>1.0000</td></tr>
+			<tr bgcolor="#D4D4C0"><td>RIFF WAVE</td><td>9:58.47</td><td>9:58.47</td><td>100.68 MB</td><td>1.0000</td></tr>
 			<tr>
 				<td colspan="6" bgcolor="#F4F4CC">&nbsp;</td>
 			</tr>
 			<tr>
-				<td align="right" rowspan="27" bgcolor="#F4F4CC">
+				<td align="right" rowspan="26" bgcolor="#F4F4CC">
 					Frederic Chopin<br /><i>Prelude No.24 in d minor</i>
 				</td>
 			</tr>
-			<!-- bgcolor="#D3D4C5" -->
+			<!-- bgcolor="#D4D4C0" -->
 			<tr><td>La 0.3c</td><td>5:14.83</td><td>5:03.08</td><td>9.84 MB</td><td>0.3582</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Monkey's Audio 3.99 (insane)</td><td>4:33.42</td><td>4:45.16</td><td>9.96 MB</td><td>0.3625</td></tr>
+			<tr bgcolor="#D4D4C0"><td>Monkey's Audio 3.99 (insane)</td><td>4:33.42</td><td>4:45.16</td><td>9.96 MB</td><td>0.3625</td></tr>
 			<tr><td>Monkey's Audio 3.99 (extra high)</td><td>0:59.94</td><td>1:01.87</td><td>10.16 MB</td><td>0.3699</td></tr>
-			<tr bgcolor="#D3D4C5"><td>optimFROG 4.21 (mode 4 @ 1x)</td><td>11:56.24</td><td>11:58.77</td><td>10.34 MB</td><td>0.3764</td></tr>
+			<tr bgcolor="#D4D4C0"><td>optimFROG 4.21 (mode 4 @ 1x)</td><td>11:56.24</td><td>11:58.77</td><td>10.34 MB</td><td>0.3764</td></tr>
 			<tr><td>Monkey's Audio 3.99 (high)</td><td>0:32.29</td><td>0:34.49</td><td>10.40 MB</td><td>0.3788</td></tr>
-			<tr bgcolor="#D3D4C5"><td>optimFROG 4.21 (mode 1 @ 4x)</td><td>0:50.07</td><td>0:53.49</td><td>10.41 MB</td><td>0.3790</td></tr>
+			<tr bgcolor="#D4D4C0"><td>optimFROG 4.21 (mode 1 @ 4x)</td><td>0:50.07</td><td>0:53.49</td><td>10.41 MB</td><td>0.3790</td></tr>
 			<tr><td>Monkey's Audio 3.99 (normal)</td><td>0:27.35</td><td>0:29.51</td><td>10.52 MB</td><td>0.3832</td></tr>
-			<tr bgcolor="#D3D4C5"><td>optimFROG 4.21 (mode 0 @ 4x)</td><td>0:34.06</td><td>0:38.70</td><td>10.53 MB</td><td>0.3833</td></tr>
+			<tr bgcolor="#D4D4C0"><td>optimFROG 4.21 (mode 0 @ 4x)</td><td>0:34.06</td><td>0:38.70</td><td>10.53 MB</td><td>0.3833</td></tr>
 			<tr><td>LPAC 1.40 (-r, normal)</td><td>0:34.91</td><td>0:20.01</td><td>10.74 MB</td><td>0.3911</td></tr>
-			<tr bgcolor="#D3D4C5"><td>WavPack 3.97a (high)</td><td>0:31.43</td><td>0:28.95</td><td>10.76 MB</td><td>0.3919</td></tr>
-			<tr><td>RKAU 1.07 (normal)</td><td>0:54.46</td><td>0:41.54</td><td>10.88 MB</td><td>0.3963</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Monkey's Audio 3.99 (fast)</td><td>0:21.10</td><td>0:23.90</td><td>10.94 MB</td><td>0.3982</td></tr>
-			<tr><td>WavPack 3.97a (normal)</td><td>0:16.90</td><td>0:15.17</td><td>11.34 MB</td><td>0.4128</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Apple Lossless</td><td>?</td><td>?</td><td>11.51 MB</td><td>0.4191</td></tr>
-			<tr><td>flac 1.1.1 (-8)</td><td>1:53.31</td><td>0:13.06</td><td>11.69 MB</td><td>0.4256</td></tr>
-			<tr bgcolor="#FFFFFF"><td>flac 1.1.1 (-5, default)</td><td>0:26.05</td><td>0:13.50</td><td>11.71 MB</td><td>0.4265</td></tr>
-			<tr><td>flac 1.1.1 (-3)</td><td>0:19.82</td><td>0:13.25</td><td>11.74 MB</td><td>0.4274</td></tr>
-			<tr bgcolor="#D3D4C5"><td>flac 1.1.1 (-1)</td><td>0:17.61</td><td>0:13.80</td><td>11.86 MB</td><td>0.4319</td></tr>
-			<tr><td>Shorten 3.2a (-p0 -b256, default)</td><td>0:19.20</td><td>0:11.89</td><td>12.05 MB</td><td>0.4386</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Kexis 0.2.2</td><td>0:36.70</td><td>0:30.26</td><td>12.14 MB</td><td>0.4419</td></tr>
+			<tr bgcolor="#D4D4C0"><td>WavPack 4.31 (high)</td><td>0:29.86</td><td>0:23.69</td><td>10.75 MB</td><td>0.3914</td></tr>
+			<tr><td>WavPack 4.31 (normal -x)</td><td>4:00.51</td><td>0:15.44</td><td>10.82 MB</td><td>0.3940</td></tr>
+			<tr bgcolor="#D4D4C0"><td>RKAU 1.07 (normal)</td><td>0:54.46</td><td>0:41.54</td><td>10.88 MB</td><td>0.3963</td></tr>
+			<tr><td>Monkey's Audio 3.99 (fast)</td><td>0:21.10</td><td>0:23.90</td><td>10.94 MB</td><td>0.3982</td></tr>
+			<tr bgcolor="#D4D4C0"><td>WavPack 4.31 (normal)</td><td>0:21.15</td><td>0:16.34</td><td>11.31 MB</td><td>0.4118</td></tr>
+			<tr><td>Apple Lossless</td><td>?</td><td>?</td><td>11.51 MB</td><td>0.4191</td></tr>
+			<tr bgcolor="#D4D4C0"><td>flac 1.1.3 (-8)</td><td>1:50.43</td><td>0:12.97</td><td>11.41 MB</td><td>0.4154</td></tr>
+			<tr bgcolor="#FFFFFF"><td>flac 1.1.3 (-5, default)</td><td>0:27.24</td><td>0:13.30</td><td>11.60 MB</td><td>0.4222</td></tr>
+			<tr bgcolor="#D4D4C0"><td>flac 1.1.3 (-3)</td><td>0:20.26</td><td>0:13.61</td><td>11.61 MB</td><td>0.4226</td></tr>
+			<tr><td>flac 1.1.3 (-1)</td><td>0:16.34</td><td>0:13.42</td><td>11.86 MB</td><td>0.4317</td></tr>
+			<tr bgcolor="#D4D4C0"><td>Shorten 3.2a (-p0 -b256, default)</td><td>0:19.20</td><td>0:11.89</td><td>12.05 MB</td><td>0.4386</td></tr>
 			<tr><td>Bonk 0.5</td><td>1:15.45</td><td>0:55.07</td><td>12.86 MB</td><td>0.4684</td></tr>
-			<tr bgcolor="#D3D4C5"><td>WaveZIP</td><td>0:18.75</td><td>?</td><td>13.08 MB</td><td>0.4765</td></tr>
-			<tr><td>Ogg Squish 0.98</td><td>?</td><td>?</td><td>13.31 MB</td><td>0.4845</td></tr>
-			<tr bgcolor="#D3D4C5"><td>WavPack 3.97a (fast)</td><td>0:06.74</td><td>0:08.51</td><td>13.67 MB</td><td>0.4978</td></tr>
+			<tr bgcolor="#D4D4C0"><td>Ogg Squish 0.98</td><td>?</td><td>?</td><td>13.31 MB</td><td>0.4845</td></tr>
 			<tr><td>Shorten 3.2a (-p8 -b2048)</td><td>0:24.43</td><td>0:14.32</td><td>14.40 MB</td><td>0.5242</td></tr>
-			<tr bgcolor="#D3D4C5"><td>RIFF WAVE</td><td>2:43.23</td><td>2:43.23</td><td>27.46 MB</td><td>1.0000</td></tr>
+			<tr bgcolor="#D4D4C0"><td>RIFF WAVE</td><td>2:43.23</td><td>2:43.23</td><td>27.46 MB</td><td>1.0000</td></tr>
 			<tr>
 				<td colspan="6" bgcolor="#F4F4CC">&nbsp;</td>
 			</tr>
 			<tr>
-				<td align="right" rowspan="27" bgcolor="#F4F4CC">
+				<td align="right" rowspan="26" bgcolor="#F4F4CC">
 					Domenico Scarlatti<br /><i>Sonata K.42 (arr.Yepes for guitar)</i>
 				</td>
 			</tr>
-			<!-- bgcolor="#D3D4C5" -->
+			<!-- bgcolor="#D4D4C0" -->
 			<tr><td>La 0.3c</td><td>3:09.33</td><td>3:01.82</td><td>6.62 MB</td><td>0.4036</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Monkey's Audio 3.99 (insane)</td><td>2:46.09</td><td>2:52.52</td><td>6.67 MB</td><td>0.4068</td></tr>
+			<tr bgcolor="#D4D4C0"><td>Monkey's Audio 3.99 (insane)</td><td>2:46.09</td><td>2:52.52</td><td>6.67 MB</td><td>0.4068</td></tr>
 			<tr><td>Monkey's Audio 3.99 (extra high)</td><td>0:36.21</td><td>0:38.16</td><td>6.74 MB</td><td>0.4109</td></tr>
-			<tr bgcolor="#D3D4C5"><td>optimFROG 4.21 (mode 4 @ 1x)</td><td>7:08.77</td><td>7:09.52</td><td>6.87 MB</td><td>0.4190</td></tr>
+			<tr bgcolor="#D4D4C0"><td>optimFROG 4.21 (mode 4 @ 1x)</td><td>7:08.77</td><td>7:09.52</td><td>6.87 MB</td><td>0.4190</td></tr>
 			<tr><td>Monkey's Audio 3.99 (high)</td><td>0:19.60</td><td>0:20.23</td><td>6.91 MB</td><td>0.4213</td></tr>
-			<tr bgcolor="#D3D4C5"><td>optimFROG 4.21 (mode 1 @ 4x)</td><td>0:30.47</td><td>0:31.95</td><td>6.98 MB</td><td>0.4255</td></tr>
+			<tr bgcolor="#D4D4C0"><td>optimFROG 4.21 (mode 1 @ 4x)</td><td>0:30.47</td><td>0:31.95</td><td>6.98 MB</td><td>0.4255</td></tr>
 			<tr><td>Monkey's Audio 3.99 (normal)</td><td>0:16.73</td><td>0:17.60</td><td>6.99 MB</td><td>0.4261</td></tr>
-			<tr bgcolor="#D3D4C5"><td>RKAU 1.07 (normal)</td><td>0:37.09</td><td>0:26.56</td><td>7.05 MB</td><td>0.4297</td></tr>
+			<tr bgcolor="#D4D4C0"><td>RKAU 1.07 (normal)</td><td>0:37.09</td><td>0:26.56</td><td>7.05 MB</td><td>0.4297</td></tr>
 			<tr><td>optimFROG 4.21 (mode 0 @ 4x)</td><td>0:20.68</td><td>0:22.06</td><td>7.07 MB</td><td>0.4310</td></tr>
-			<tr bgcolor="#D3D4C5"><td>WavPack 3.97a (high)</td><td>0:15.50</td><td>0:18.31</td><td>7.12 MB</td><td>0.4340</td></tr>
+			<tr bgcolor="#D4D4C0"><td>WavPack 4.31 (high)</td><td>0:17.68</td><td>0:13.99</td><td>7.15 MB</td><td>0.4358</td></tr>
 			<tr><td>Monkey's Audio 3.99 (fast)</td><td>0:12.96</td><td>0:14.28</td><td>7.16 MB</td><td>0.4369</td></tr>
-			<tr bgcolor="#D3D4C5"><td>LPAC 1.40 (-r, normal)</td><td>0:29.99</td><td>0:14.33</td><td>7.21 MB</td><td>0.4397</td></tr>
-			<tr><td>WavPack 3.97a (normal)</td><td>0:07.01</td><td>0:10.27</td><td>7.31 MB</td><td>0.4460</td></tr>
-			<tr bgcolor="#D3D4C5"><td>flac 1.1.1 (-8)</td><td>1:08.58</td><td>0:07.99</td><td>7.37 MB</td><td>0.4498</td></tr>
-			<tr bgcolor="#FFFFFF"><td>flac 1.1.1 (-5, default)</td><td>0:15.90</td><td>0:08.71</td><td>7.40 MB</td><td>0.4513</td></tr>
-			<tr bgcolor="#D3D4C5"><td>flac 1.1.1 (-3)</td><td>0:11.84</td><td>0:08.26</td><td>7.43 MB</td><td>0.4530</td></tr>
-			<tr><td>Apple Lossless</td><td>?</td><td>?</td><td>7.44 MB</td><td>0.4541</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Bonk 0.5</td><td>0:45.59</td><td>0:32.63</td><td>7.46 MB</td><td>0.4548</td></tr>
-			<tr><td>Shorten 3.2a (-p0 -b256, default)</td><td>0:11.67</td><td>0:07.17</td><td>7.48 MB</td><td>0.4564</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Kexis 0.2.2</td><td>0:22.06</td><td>0:18.62</td><td>7.50 MB</td><td>0.4572</td></tr>
-			<tr><td>flac 1.1.1 (-1)</td><td>0:10.17</td><td>0:07.85</td><td>7.53 MB</td><td>0.4591</td></tr>
-			<tr bgcolor="#D3D4C5"><td>WavPack 3.97a (fast)</td><td>0:04.11</td><td>0:06.57</td><td>7.58 MB</td><td>0.4624</td></tr>
-			<tr><td>Ogg Squish 0.98</td><td>?</td><td>?</td><td>7.74 MB</td><td>0.4723</td></tr>
-			<tr bgcolor="#D3D4C5"><td>WaveZIP</td><td>0:10.56</td><td>?</td><td>7.83 MB</td><td>0.4781</td></tr>
+			<tr bgcolor="#D4D4C0"><td>WavPack 4.31 (normal -x)</td><td>2:37.81</td><td>0:09.09</td><td>7.21 MB</td><td>0.4396</td></tr>
+			<tr><td>LPAC 1.40 (-r, normal)</td><td>0:29.99</td><td>0:14.33</td><td>7.21 MB</td><td>0.4397</td></tr>
+			<tr bgcolor="#D4D4C0"><td>flac 1.1.3 (-8)</td><td>1:11.03</td><td>0:08.30</td><td>7.29 MB</td><td>0.4445</td></tr>
+			<tr bgcolor="#FFFFFF"><td>flac 1.1.3 (-5, default)</td><td>0:16.56</td><td>0:08.11</td><td>7.34 MB</td><td>0.4477</td></tr>
+			<tr bgcolor="#D4D4C0"><td>flac 1.1.3 (-3)</td><td>0:12.15</td><td>0:07.61</td><td>7.36 MB</td><td>0.4488</td></tr>
+			<tr><td>WavPack 4.31 (normal)</td><td>0:12.60</td><td>0:09.46</td><td>7.41 MB</td><td>0.4518</td></tr>
+			<tr bgcolor="#D4D4C0"><td>Apple Lossless</td><td>?</td><td>?</td><td>7.44 MB</td><td>0.4541</td></tr>
+			<tr><td>Bonk 0.5</td><td>0:45.59</td><td>0:32.63</td><td>7.46 MB</td><td>0.4548</td></tr>
+			<tr bgcolor="#D4D4C0"><td>Shorten 3.2a (-p0 -b256, default)</td><td>0:11.67</td><td>0:07.17</td><td>7.48 MB</td><td>0.4564</td></tr>
+			<tr><td>flac 1.1.3 (-1)</td><td>0:09.81</td><td>0:07.73</td><td>7.52 MB</td><td>0.4589</td></tr>
+			<tr bgcolor="#D4D4C0"><td>Ogg Squish 0.98</td><td>?</td><td>?</td><td>7.74 MB</td><td>0.4723</td></tr>
 			<tr><td>Shorten 3.2a (-p8 -b2048)</td><td>0:14.29</td><td>0:09.07</td><td>8.20 MB</td><td>0.5004</td></tr>
-			<tr bgcolor="#D3D4C5"><td>RIFF WAVE</td><td>1:37.43</td><td>1:37.43</td><td>16.39 MB</td><td>1.0000</td></tr>
+			<tr bgcolor="#D4D4C0"><td>RIFF WAVE</td><td>1:37.43</td><td>1:37.43</td><td>16.39 MB</td><td>1.0000</td></tr>
 			<tr>
 				<td colspan="6" bgcolor="#F4F4CC">&nbsp;</td>
 			</tr>
 			<tr>
-				<td align="right" rowspan="27" bgcolor="#F4F4CC">
+				<td align="right" rowspan="26" bgcolor="#F4F4CC">
 					The Benedictine Monks of<br />Santo Domingo de Silos<br /><i>Laetatus sum</i>
 				</td>
 			</tr>
-			<!-- bgcolor="#D3D4C5" -->
+			<!-- bgcolor="#D4D4C0" -->
 			<tr><td>La 0.3c</td><td>4:40.71</td><td>4:32.29</td><td>11.94 MB</td><td>0.4922</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Monkey's Audio 3.99 (insane)</td><td>4:08.23</td><td>4:18.43</td><td>12.05 MB</td><td>0.4968</td></tr>
+			<tr bgcolor="#D4D4C0"><td>Monkey's Audio 3.99 (insane)</td><td>4:08.23</td><td>4:18.43</td><td>12.05 MB</td><td>0.4968</td></tr>
 			<tr><td>Monkey's Audio 3.99 (extra high)</td><td>0:54.17</td><td>0:56.87</td><td>12.09 MB</td><td>0.4981</td></tr>
-			<tr bgcolor="#D3D4C5"><td>optimFROG 4.21 (mode 4 @ 1x)</td><td>10:34.75</td><td>10:36.83</td><td>12.17 MB</td><td>0.5015</td></tr>
+			<tr bgcolor="#D4D4C0"><td>optimFROG 4.21 (mode 4 @ 1x)</td><td>10:34.75</td><td>10:36.83</td><td>12.17 MB</td><td>0.5015</td></tr>
 			<tr><td>Monkey's Audio 3.99 (high)</td><td>0:29.82</td><td>0:31.71</td><td>12.23 MB</td><td>0.5042</td></tr>
-			<tr bgcolor="#D3D4C5"><td>RKAU 1.07 (normal)</td><td>0:57.64</td><td>0:41.39</td><td>12.25 MB</td><td>0.5049</td></tr>
+			<tr bgcolor="#D4D4C0"><td>RKAU 1.07 (normal)</td><td>0:57.64</td><td>0:41.39</td><td>12.25 MB</td><td>0.5049</td></tr>
 			<tr><td>Monkey's Audio 3.99 (normal)</td><td>0:25.63</td><td>0:27.41</td><td>12.42 MB</td><td>0.5118</td></tr>
-			<tr bgcolor="#D3D4C5"><td>optimFROG 4.21 (mode 1 @ 4x)</td><td>0:45.20</td><td>0:48.45</td><td>12.43 MB</td><td>0.5121</td></tr>
+			<tr bgcolor="#D4D4C0"><td>optimFROG 4.21 (mode 1 @ 4x)</td><td>0:45.20</td><td>0:48.45</td><td>12.43 MB</td><td>0.5121</td></tr>
 			<tr><td>LPAC 1.40 (-r, normal)</td><td>0:45.66</td><td>0:23.29</td><td>12.62 MB</td><td>0.5200</td></tr>
-			<tr bgcolor="#D3D4C5"><td>optimFROG 4.21 (mode 0 @ 4x)</td><td>0:31.03</td><td>0:33.69</td><td>12.63 MB</td><td>0.5207</td></tr>
-			<tr><td>WavPack 3.97a (high)</td><td>0:28.01</td><td>0:27.43</td><td>12.65 MB</td><td>0.5213</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Bonk 0.5</td><td>1:08.18</td><td>0:49.70</td><td>12.71 MB</td><td>0.5237</td></tr>
-			<tr><td>Monkey's Audio 3.99 (fast)</td><td>0:19.79</td><td>0:21.78</td><td>12.76 MB</td><td>0.5260</td></tr>
-			<tr bgcolor="#D3D4C5"><td>flac 1.1.1 (-8)</td><td>1:43.74</td><td>0:13.23</td><td>12.82 MB</td><td>0.5286</td></tr>
-			<tr bgcolor="#FFFFFF"><td>flac 1.1.1 (-5, default)</td><td>0:24.12</td><td>0:13.08</td><td>12.92 MB</td><td>0.5325</td></tr>
-			<tr bgcolor="#D3D4C5"><td>WavPack 3.97a (normal)</td><td>0:15.61</td><td>0:15.35</td><td>12.98 MB</td><td>0.5348</td></tr>
-			<tr><td>flac 1.1.1 (-3)</td><td>0:18.80</td><td>0:13.85</td><td>12.98 MB</td><td>0.5349</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Apple Lossless</td><td>?</td><td>?</td><td>13.04 MB</td><td>0.5377</td></tr>
-			<tr><td>WavPack 3.97a (fast)</td><td>0:11.07</td><td>0:10.38</td><td>13.30 MB</td><td>0.5481</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Kexis 0.2.2</td><td>0:33.43</td><td>0:28.11</td><td>13.30 MB</td><td>0.5481</td></tr>
-			<tr><td>Shorten 3.2a (-p0 -b256, default)</td><td>0:17.80</td><td>0:11.46</td><td>13.32 MB</td><td>0.5489</td></tr>
-			<tr bgcolor="#D3D4C5"><td>flac 1.1.1 (-1)</td><td>0:15.60</td><td>0:12.82</td><td>13.34 MB</td><td>0.5500</td></tr>
-			<tr><td>Ogg Squish 0.98</td><td>?</td><td>?</td><td>13.41 MB</td><td>0.5528</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Shorten 3.2a (-p8 -b2048)</td><td>0:22.30</td><td>0:13.87</td><td>13.42 MB</td><td>0.5531</td></tr>
-			<tr><td>WaveZIP</td><td>0:16.37</td><td>?</td><td>13.72 MB</td><td>0.5655</td></tr>
-			<tr bgcolor="#D3D4C5"><td>RIFF WAVE</td><td>2:24.21</td><td>2:24.21</td><td>24.26 MB</td><td>1.0000</td></tr>
+			<tr bgcolor="#D4D4C0"><td>optimFROG 4.21 (mode 0 @ 4x)</td><td>0:31.03</td><td>0:33.69</td><td>12.63 MB</td><td>0.5207</td></tr>
+			<tr><td>WavPack 4.31 (high)</td><td>0:28.01</td><td>0:22.54</td><td>12.71 MB</td><td>0.5237</td></tr>
+			<tr bgcolor="#D4D4C0"><td>Bonk 0.5</td><td>1:08.18</td><td>0:49.70</td><td>12.71 MB</td><td>0.5237</td></tr>
+			<tr><td>flac 1.1.3 (-8)</td><td>1:47.05</td><td>0:13.07</td><td>12.75 MB</td><td>0.5254</td></tr>
+			<tr bgcolor="#D4D4C0"><td>Monkey's Audio 3.99 (fast)</td><td>0:19.79</td><td>0:21.78</td><td>12.76 MB</td><td>0.5260</td></tr>
+			<tr><td>WavPack 4.31 (normal -x)</td><td>4:50.94</td><td>0:14.09</td><td>12.77 MB</td><td>0.5264</td></tr>
+			<tr bgcolor="#FFFFFF"><td>flac 1.1.3 (-5, default)</td><td>0:25.10</td><td>0:13.06</td><td>12.85 MB</td><td>0.5298</td></tr>
+			<tr><td>flac 1.1.3 (-3)</td><td>0:18.41</td><td>0:12.76</td><td>12.92 MB</td><td>0.5325</td></tr>
+			<tr bgcolor="#D4D4C0"><td>WavPack 4.31 (normal)</td><td>0:18.79</td><td>0:14.77</td><td>12.99 MB</td><td>0.5354</td></tr>
+			<tr><td>Apple Lossless</td><td>?</td><td>?</td><td>13.04 MB</td><td>0.5377</td></tr>
+			<tr bgcolor="#D4D4C0"><td>Shorten 3.2a (-p0 -b256, default)</td><td>0:17.80</td><td>0:11.46</td><td>13.32 MB</td><td>0.5489</td></tr>
+			<tr><td>flac 1.1.3 (-1)</td><td>0:15.07</td><td>0:12.65</td><td>13.34 MB</td><td>0.5498</td></tr>
+			<tr bgcolor="#D4D4C0"><td>Ogg Squish 0.98</td><td>?</td><td>?</td><td>13.41 MB</td><td>0.5528</td></tr>
+			<tr><td>Shorten 3.2a (-p8 -b2048)</td><td>0:22.30</td><td>0:13.87</td><td>13.42 MB</td><td>0.5531</td></tr>
+			<tr bgcolor="#D4D4C0"><td>RIFF WAVE</td><td>2:24.21</td><td>2:24.21</td><td>24.26 MB</td><td>1.0000</td></tr>
 			<tr>
 				<td colspan="6" bgcolor="#F4F4CC">&nbsp;</td>
 			</tr>
 			<tr>
-				<td align="right" rowspan="27" bgcolor="#F4F4CC">
+				<td align="right" rowspan="26" bgcolor="#F4F4CC">
 					L. Subramaniam<br /><i>Raga Sivapriya</i>
 				</td>
 			</tr>
-			<!-- bgcolor="#D3D4C5" -->
+			<!-- bgcolor="#D4D4C0" -->
 			<tr><td>La 0.3c</td><td>41:10.10</td><td>39:35.28</td><td>87.51 MB</td><td>0.4097</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Monkey's Audio 3.99 (insane)</td><td>35:41.10</td><td>37:34.17</td><td>89.18 MB</td><td>0.4175</td></tr>
+			<tr bgcolor="#D4D4C0"><td>Monkey's Audio 3.99 (insane)</td><td>35:41.10</td><td>37:34.17</td><td>89.18 MB</td><td>0.4175</td></tr>
 			<tr><td>Monkey's Audio 3.99 (extra high)</td><td>7:46.70</td><td>8:10.97</td><td>90.95 MB</td><td>0.4258</td></tr>
-			<tr bgcolor="#D3D4C5"><td>optimFROG 4.21 (mode 4 @ 1x)</td><td>93:05.00</td><td>93:16.00</td><td>92.05 MB</td><td>0.4310</td></tr>
+			<tr bgcolor="#D4D4C0"><td>optimFROG 4.21 (mode 4 @ 1x)</td><td>93:05.00</td><td>93:16.00</td><td>92.05 MB</td><td>0.4310</td></tr>
 			<tr><td>optimFROG 4.21 (mode 1 @ 4x)</td><td>6:36.86</td><td>6:57.69</td><td>92.76 MB</td><td>0.4343</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Monkey's Audio 3.99 (high)</td><td>4:15.82</td><td>4:35.33</td><td>93.15 MB</td><td>0.4361</td></tr>
+			<tr bgcolor="#D4D4C0"><td>Monkey's Audio 3.99 (high)</td><td>4:15.82</td><td>4:35.33</td><td>93.15 MB</td><td>0.4361</td></tr>
 			<tr><td>Monkey's Audio 3.99 (normal)</td><td>3:38.02</td><td>3:58.75</td><td>94.32 MB</td><td>0.4416</td></tr>
-			<tr bgcolor="#D3D4C5"><td>optimFROG 4.21 (mode 0 @ 4x)</td><td>4:29.57</td><td>4:53.01</td><td>94.74 MB</td><td>0.4436</td></tr>
+			<tr bgcolor="#D4D4C0"><td>optimFROG 4.21 (mode 0 @ 4x)</td><td>4:29.57</td><td>4:53.01</td><td>94.74 MB</td><td>0.4436</td></tr>
 			<tr><td>RKAU 1.07 (normal)</td><td>7:16.09</td><td>5:30.33</td><td>95.91 MB</td><td>0.4490</td></tr>
-			<tr bgcolor="#D3D4C5"><td>WavPack 3.97a (high)</td><td>3:41.17</td><td>3:56.70</td><td>96.51 MB</td><td>0.4518</td></tr>
-			<tr><td>LPAC 1.40 (-r, normal)</td><td>4:34.06</td><td>2:37.68</td><td>96.84 MB</td><td>0.4534</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Monkey's Audio 3.99 (fast)</td><td>2:49.87</td><td>3:15.34</td><td>95.34 MB</td><td>0.4464</td></tr>
-			<tr><td>WavPack 3.97a (normal)</td><td>1:50.85</td><td>2:10.55</td><td>97.75 MB</td><td>0.4577</td></tr>
-			<tr bgcolor="#D3D4C5"><td>flac 1.1.1 (-8)</td><td>15:02.46</td><td>1:51.15</td><td>98.02 MB</td><td>0.4589</td></tr>
-			<tr bgcolor="#FFFFFF"><td>flac 1.1.1 (-5, default)</td><td>3:28.92</td><td>1:53.07</td><td>98.42 MB</td><td>0.4608</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Apple Lossless</td><td>?</td><td>?</td><td>98.57 MB</td><td>0.4615</td></tr>
+			<tr bgcolor="#D4D4C0"><td>LPAC 1.40 (-r, normal)</td><td>4:34.06</td><td>2:37.68</td><td>96.84 MB</td><td>0.4534</td></tr>
+			<tr><td>flac 1.1.3 (-8)</td><td>15:30.04</td><td>1:53.60</td><td>97.01 MB</td><td>0.4542</td></tr>
+			<tr bgcolor="#D4D4C0"><td>Monkey's Audio 3.99 (fast)</td><td>2:49.87</td><td>3:15.34</td><td>95.34 MB</td><td>0.4464</td></tr>
+			<tr><td>WavPack 4.31 (high)</td><td>4:04.70</td><td>3:09.63</td><td>96.65 MB</td><td>0.4525</td></tr>
+			<tr bgcolor="#D4D4C0"><td>WavPack 4.31 (normal -x)</td><td>33:56.08</td><td>2:05.80</td><td>96.88 MB</td><td>0.4536</td></tr>
+			<tr bgcolor="#FFFFFF"><td>flac 1.1.3 (-5, default)</td><td>3:36.86</td><td>1:54.45</td><td>97.44 MB</td><td>0.4562</td></tr>
+			<tr bgcolor="#D4D4C0"><td>WavPack 4.31 (normal)</td><td>2:44.95</td><td>2:08.99</td><td>97.90 MB</td><td>0.4584</td></tr>
+			<tr><td>flac 1.1.3 (-3)</td><td>2:40.24</td><td>1:49.84</td><td>98.20 MB</td><td>0.4598</td></tr>
+			<tr bgcolor="#D4D4C0"><td>Apple Lossless</td><td>?</td><td>?</td><td>98.57 MB</td><td>0.4615</td></tr>
 			<tr><td>Bonk 0.5</td><td>9:56.25</td><td>7:13.68</td><td>98.94 MB</td><td>0.4633</td></tr>
-			<tr bgcolor="#D3D4C5"><td>flac 1.1.1 (-3)</td><td>2:38.79</td><td>1:49.93</td><td>99.22 MB</td><td>0.4645</td></tr>
-			<tr><td>Ogg Squish 0.98</td><td>?</td><td>?</td><td>101.88 MB</td><td>0.4770</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Shorten 3.2a (-p8 -b2048)</td><td>3:10.19</td><td>1:56.31</td><td>102.60 MB</td><td>0.4804</td></tr>
-			<tr><td>Shorten 3.2a (-p0 -b256, default)</td><td>2:36.48</td><td>1:42.35</td><td>102.84 MB</td><td>0.4815</td></tr>
-			<tr bgcolor="#D3D4C5"><td>Kexis 0.2.2</td><td>4:49.84</td><td>3:59.93</td><td>103.57 MB</td><td>0.4849</td></tr>
-			<tr><td>flac 1.1.1 (-1)</td><td>2:15.70</td><td>1:51.81</td><td>103.60 MB</td><td>0.4851</td></tr>
-			<tr bgcolor="#D3D4C5"><td>WavPack 3.97a (fast)</td><td>1:34.44</td><td>1:24.44</td><td>103.86 MB</td><td>0.4863</td></tr>
-			<tr><td>WaveZIP</td><td>2:25.86</td><td>?</td><td>107.47 MB</td><td>0.5032</td></tr>
-			<tr bgcolor="#D3D4C5"><td>RIFF WAVE</td><td>21:09.47</td><td>21:09.47</td><td>213.56 MB</td><td>1.0000</td></tr>
+			<tr bgcolor="#D4D4C0"><td>Ogg Squish 0.98</td><td>?</td><td>?</td><td>101.88 MB</td><td>0.4770</td></tr>
+			<tr><td>Shorten 3.2a (-p8 -b2048)</td><td>3:10.19</td><td>1:56.31</td><td>102.60 MB</td><td>0.4804</td></tr>
+			<tr bgcolor="#D4D4C0"><td>Shorten 3.2a (-p0 -b256, default)</td><td>2:36.48</td><td>1:42.35</td><td>102.84 MB</td><td>0.4815</td></tr>
+			<tr><td>flac 1.1.3 (-1)</td><td>2:12.69</td><td>1:51.74</td><td>103.60 MB</td><td>0.4850</td></tr>
+			<tr bgcolor="#D4D4C0"><td>RIFF WAVE</td><td>21:09.47</td><td>21:09.47</td><td>213.56 MB</td><td>1.0000</td></tr>
 		</table>
 		</td></tr></table>
 
@@ -1173,7 +1051,23 @@
 
 
 <div class="copyright">
-	Copyright (c) 2000,2001,2002,2003,2004,2005,2006 Josh Coalson
+	<!-- @@@ oh so hacky -->
+	<table>
+		<tr>
+			<td align="left">
+				Copyright (c) 2000,2001,2002,2003,2004,2005,2006  Josh Coalson
+			</td>
+			<td width="1%" align="right">
+				<a href="http://sourceforge.net"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=13478&amp;type=1" width="88" height="31" border="0" alt="SourceForge.net Logo" /></a>
+			</td>
+			<td width="1%" align="right">
+				<a href="http://www.eff.org/cafe/"><img src="images/cafebug.gif" alt="CAFE Logo" border="0" /></a><br />
+			</td>
+			<td width="1%" align="right">
+				<a href="http://validator.w3.org/check?uri=referer"><img src="http://www.w3.org/Icons/valid-xhtml10" alt="Valid XHTML 1.0!" height="31" width="88" border="0" hspace="0" /></a>
+			</td>
+		</tr>
+	</table>
 </div>
 
 </body>
diff --git a/doc/html/developers.html b/doc/html/developers.html
index fc92dfe..5d2b7ab 100644
--- a/doc/html/developers.html
+++ b/doc/html/developers.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Copyright (c)  2000,2001,2002,2003,2004,2005,2006 Josh Coalson -->
+<!-- Copyright (c) 2000,2001,2002,2003,2004,2005,2006  Josh Coalson -->
 <!-- Permission is granted to copy, distribute and/or modify this document -->
 <!-- under the terms of the GNU Free Documentation License, Version 1.1 -->
 <!-- or any later version published by the Free Software Foundation; -->
@@ -53,7 +53,7 @@
 	</div>
 	<div class="box_header"></div>
 	<div class="box_body">
-		FLAC is an open source project and we are happy to enlist the help of anyone who wants to contribute.  The preferred method for transmitting improvements is patch files (in "diff -c" format) sent to the <a href="http://sourceforge.net/mail/?group_id=13478">developer mailing list</a>, but zipped up sources are OK.  Make sure to read the <a href="goals.html">FLAC goals</a> first; there are some thing the we <b>don't</b> want added to FLAC, like copy protection and lossy compression.
+		FLAC is an open source project and we are happy to enlist the help of anyone who wants to contribute.  The preferred method for transmitting improvements is patch files (in "diff -c" format) sent to the <a href="http://lists.xiph.org/mailman/listinfo/flac-dev">developer mailing list</a>, but zipped up sources are OK.  Make sure to read the <a href="goals.html">FLAC goals</a> first; there are some thing the we <b>don't</b> want added to FLAC, like copy protection and lossy compression.
 		<br /><br />
 		High priority items are:
 		<ul>
@@ -101,7 +101,23 @@
 
 
 <div class="copyright">
-	Copyright (c) 2000,2001,2002,2003,2004,2005,2006 Josh Coalson
+	<!-- @@@ oh so hacky -->
+	<table>
+		<tr>
+			<td align="left">
+				Copyright (c) 2000,2001,2002,2003,2004,2005,2006  Josh Coalson
+			</td>
+			<td width="1%" align="right">
+				<a href="http://sourceforge.net"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=13478&amp;type=1" width="88" height="31" border="0" alt="SourceForge.net Logo" /></a>
+			</td>
+			<td width="1%" align="right">
+				<a href="http://www.eff.org/cafe/"><img src="images/cafebug.gif" alt="CAFE Logo" border="0" /></a><br />
+			</td>
+			<td width="1%" align="right">
+				<a href="http://validator.w3.org/check?uri=referer"><img src="http://www.w3.org/Icons/valid-xhtml10" alt="Valid XHTML 1.0!" height="31" width="88" border="0" hspace="0" /></a>
+			</td>
+		</tr>
+	</table>
 </div>
 
 </body>
diff --git a/doc/html/documentation.html b/doc/html/documentation.html
index d752541..2d022c3 100644
--- a/doc/html/documentation.html
+++ b/doc/html/documentation.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Copyright (c)  2000,2001,2002,2003,2004,2005,2006 Josh Coalson -->
+<!-- Copyright (c) 2000,2001,2002,2003,2004,2005,2006  Josh Coalson -->
 <!-- Permission is granted to copy, distribute and/or modify this document -->
 <!-- under the terms of the GNU Free Documentation License, Version 1.1 -->
 <!-- or any later version published by the Free Software Foundation; -->
@@ -527,7 +527,7 @@
 				</td>
 				<td>
 					Import the given cuesheet file and store it in a <a href="format.html#def_CUESHEET"><span class="code">CUESHEET</span></a> metadata block.  This option may only be used when encoding a single file.  A seekpoint will be added for each index point in the cuesheet to the <a href="format.html#def_SEEKTABLE"><span class="code">SEEKTABLE</span></a> unless <span class="argument">--no-cued-seekpoints</span> is specified.<br /><br />
-					The cuesheet file must be of the sort written by <a href="http://www.goldenhawk.com/cdrwin.htm">CDRwin</a>, <a href="http://www.dcsoft.com/prod03.htm">CDRcue</a>, <a href="http://www.exactaudiocopy.de/">EAC</a>, et al.
+					The cuesheet file must be of the sort written by <a href="http://www.goldenhawk.com/cdrwin.htm">CDRwin</a>, <a href="http://www.dcsoft.com/prod03.htm">CDRcue</a>, <a href="http://www.exactaudiocopy.de/">EAC</a>, etc.  See also <a href="http://digitalx.org/cuesheetsyntax.php">cuesheet syntax</a>.
 				</td>
 			</tr>
 			<tr>
@@ -1490,14 +1490,30 @@
 			</li>
 			<li>Now you can encode FLAC files as if you were using the replaced encoder.  The renamed <span class="commandname">flac_mac.exe</span> utility will call <span class="commandname">flac.exe</span> and afterwards, <span class="commandname">flac_ren.exe</span> will rename the resulting file to have the .flac extension.</li>
 		</ul>
-		Other front-ends may be wedged in the same way; if you have one in mind, post it to the <a href="http://lists.sourceforge.net/lists/listinfo/flac-dev">flac-dev</a> mailing list.
+		Other front-ends may be wedged in the same way; if you have one in mind, post it to the <a href="http://lists.xiph.org/mailman/listinfo/flac-dev">flac-dev</a> mailing list.
 	</div>
 	<div class="box_footer"></div>
 </div>
 
 
 <div class="copyright">
-	Copyright (c) 2000,2001,2002,2003,2004,2005,2006 Josh Coalson
+	<!-- @@@ oh so hacky -->
+	<table>
+		<tr>
+			<td align="left">
+				Copyright (c) 2000,2001,2002,2003,2004,2005,2006  Josh Coalson
+			</td>
+			<td width="1%" align="right">
+				<a href="http://sourceforge.net"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=13478&amp;type=1" width="88" height="31" border="0" alt="SourceForge.net Logo" /></a>
+			</td>
+			<td width="1%" align="right">
+				<a href="http://www.eff.org/cafe/"><img src="images/cafebug.gif" alt="CAFE Logo" border="0" /></a><br />
+			</td>
+			<td width="1%" align="right">
+				<a href="http://validator.w3.org/check?uri=referer"><img src="http://www.w3.org/Icons/valid-xhtml10" alt="Valid XHTML 1.0!" height="31" width="88" border="0" hspace="0" /></a>
+			</td>
+		</tr>
+	</table>
 </div>
 
 </body>
diff --git a/doc/html/download.html b/doc/html/download.html
index 350287d..672eb52 100644
--- a/doc/html/download.html
+++ b/doc/html/download.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Copyright (c)  2000,2001,2002,2003,2004,2005,2006 Josh Coalson -->
+<!-- Copyright (c) 2000,2001,2002,2003,2004,2005,2006  Josh Coalson -->
 <!-- Permission is granted to copy, distribute and/or modify this document -->
 <!-- under the terms of the GNU Free Documentation License, Version 1.1 -->
 <!-- or any later version published by the Free Software Foundation; -->
@@ -66,8 +66,8 @@
 			<li>
 				<b>Mac OS X</b>
 				<ul>
-					<li><a href="http://www.danrules.com/macflac/">MacFLAC with installer and GUI front-end</a> (source code not available)</li>
-					<li><a href="http://software.emuscene.com/view.php?softid=10">FLACer</a> (source code not available)</li>
+					<li><!-- <a href="http://www.danrules.com/macflac/"><a href="http://www.versiontracker.com/dyn/moreinfo/macosx/15883"> --><a href="http://mac.softpedia.com/get/Audio/MacFLAC.shtml">MacFLAC with installer and GUI front-end</a> (source code not available)</li>
+					<li><a href="http://www.macupdate.com/info.php/id/16458">FLACer</a> (source code not available)</li>
 					<li><a href="http://www.versiontracker.com/dyn/moreinfo/macosx/21952">xACT with installer and GUI front-end</a> (source code included)</li>
 					<li><a href="http://fink.sourceforge.net/pdb/package.php/flac">FLAC Fink package</a> for use with <a href="http://fink.sourceforge.net/">Fink</a></li>
 					<li><a href="http://prdownloads.sourceforge.net/flac/flac-1.1.2-osx-ppc.tar.gz?download">FLAC 1.1.2 for OS X (no installer)</a></li>
@@ -76,7 +76,7 @@
 			<li>
 				<b>Windows</b>
 				<ul>
-					<li><a href="http://cyberial.com/flacinstaller.asp">FLAC 1.1.2 for Windows with installer</a>. <b>NOTE: </b>Several virus scanners are reporting that FLAC contains a trojan; this is a FALSE POSITIVE.  For more info see <a href="http://nsis.sourceforge.net/index.php?id=2&amp;backPID=2&amp;tt_news=14">here</a>, <a href="http://servicenews.symantec.com/cgi-bin/displayArticle.cgi?article=29991&amp;group=symantec.support.generic.virus_corporate.general&amp;tpre=ent">here</a>, <a href="http://forums.mcafeehelp.com/viewtopic.php?p=164312">here</a>.</li>
+					<li><a href="http://cyberial.com/flacinstaller.asp">FLAC 1.1.2 for Windows with installer</a> (<a href="http://downloads.sourceforge.net/flac/flac112a.exe?use_mirror=superb-west">alternate link</a>). <b>NOTE: </b>Several virus scanners are reporting that FLAC contains a trojan; this is a FALSE POSITIVE.  For more info see <a href="http://nsis.sourceforge.net/index.php?id=2&amp;backPID=2&amp;tt_news=14">here</a>, <a href="http://servicenews.symantec.com/cgi-bin/displayArticle.cgi?article=29991&amp;group=symantec.support.generic.virus_corporate.general&amp;tpre=ent">here</a>, <a href="http://forums.mcafeehelp.com/viewtopic.php?p=164312">here</a>.</li>
 					<li><a href="http://prdownloads.sourceforge.net/flac/flac-1.1.2-win.zip?download">FLAC 1.1.2 for Windows (tools only)</a></li>
 				</ul>
 			</li>
@@ -109,30 +109,33 @@
 
 <br />
 
-<a name="extras" />
 <div class="box">
 	<div class="box_title">
-		extras
+		<a name="extras">extras</a>
 	</div>
 	<div class="box_header"></div>
 	<div class="box_body">
-		<b>NOTE: </b> these extras are not part of the FLAC project.  They are all freely available but distributed under their authors' own terms.
+		<b>NOTE: </b> these extras are not part of the FLAC project.  Most (except those marked [$]) are freely available but distributed under their authors' own terms.
 		<br /><br />
-		<b>NOTE: </b> don't forget to check out the <a href="links.html">links page</a> for a list of other useful open-source software supporting FLAC.
+		<b>NOTE: </b> make sure to check out the <a href="links.html">links page</a> for a large list of open-source software supporting FLAC.
 		<br /><br />
 		<b>GUI encoding/decoding front-ends:</b>
 		<ul>
 			<li>
 				<b>Windows</b>
 				<ul>
+					<li><a href="http://www.legroom.net/modules.php?op=modload&name=Open_Source&file=index&page=software&app=autoflac">AutoFLAC</a> for automated ripping and encoding to FLAC with EAC (ExactAudioCopy); also has a write mode for burning back to CD for an exact copy</li>
 					<li><a href="http://www.dbpoweramp.com/">dBpowerAMP</a>, a swiss army knife that can convert and play many formats, including FLAC.</li>
 					<li><a href="http://www.uninformative.com/flacattack/">Flacattack</a>: an all-in-one tool that works with ExactAudioCopy to encode a CD image to FLAC, embed the cuesheet, add ReplayGain, create lossy files, etc. all in a customizable directory structure.</li>
 					<li><a href="http://www.rarewares.org/lossless.html">FLACdrop</a>, an Oggdrop-like frontend for Windows, or the even more versatile <a href="http://homepage.ntlworld.com/jfe1205/">oggdropXPd</a>.</li>
-					<li><a href="http://home.wanadoo.nl/~w.speek/flac.htm">FLAC frontend</a>, a Windows GUI, or the even more versatile <a href="http://home.wanadoo.nl/~w.speek/multi.htm">Multi frontend</a>.</li>
+					<li><a href="http://members.home.nl/w.speek/flac.htm">FLAC frontend</a>, a Windows GUI, or the even more versatile <a href="http://home.wanadoo.nl/~w.speek/multi.htm">Multi frontend</a>.</li>
+					<li><a href="http://www.vuplayer.com/other.htm">FLACTester</a>, can test a whole tree of FLAC files for errors and generate a report.</li>
 					<li><a href="http://home.vxu.se/mdati00/frontah/">Frontah</a>, a new frontend to many codecs, including FLAC.  Still in beta but has good reviews.</li>
+					<li><a href="http://www.germanixsoft.de/">GX::Transcoder</a></li>
 					<li><a href="http://mareo.netfirms.com/">MAREO</a> is a "virtual" encoder that can be used with ExactAudioCopy to encode to multiple formats (including FLAC) at once while ripping.</li>
 					<li><a href="http://www.monkeysaudio.com/">Monkey's Audio</a> can be fooled into supporting FLAC as an external encoder; <a href="documentation.html#monkey">here's how</a>.</li>
 					<li><a href="http://www.unifront.boereck.de/">UniversalFront</a>, an encoding/decoding/transcoding GUI that is also scriptable.</li>
+					<li><a href="http://music.yahoo.com/musicengine/">Yahoo! Music Engine</a></li>
 				</ul>
 			</li>
 			<li>
@@ -145,11 +148,20 @@
 			<li>
 				<b>Mac OS X</b>
 				<ul>
-					<li><a href="http://www.danrules.com/macflac/">MacFLAC</a>, a FLAC distribution which also includes nice graphical front-end.</li>
+					<li><a href="http://www.lexial.ca/alex/applescripts/iTunes_to_flac.html">iTunes-to-FLAC</a>, an AppleScript for converting between FLAC and WAVE/AIFF with tagging via iTunes.</li>
+					<li><!-- <a href="http://www.danrules.com/macflac/"><a href="http://www.versiontracker.com/dyn/moreinfo/macosx/15883"> --><a href="http://mac.softpedia.com/get/Audio/MacFLAC.shtml">MacFLAC</a>, a FLAC distribution which also includes nice graphical front-end.</li>
+					<li><a href="http://sbooth.org/Max/">Max</a>, a CD ripper and encoder that supports several formats including FLAC.</li>
+					<li><a href="http://www.chaoticsoftware.com/ProductPages/MediaRage.html">MediaRage</a>, for editing FLAC metadata (also supports Vorbis and other formats).</li>
 					<li><a href="http://members.rogers.com/beamsplitter/">RipBeak</a> is a nice GUI encoding frond-end that supports FLAC as well as Vorbis and MP3.</li>
 					<li><a href="http://www.versiontracker.com/dyn/moreinfo/macosx/21952">xACT</a>, another FLAC distribution with a graphical front-end to FLAC and other formats.</li>
 				</ul>
 			</li>
+			<li>
+				<b>Pocket PC</b>
+				<ul>
+					<li>[$] <a href="http://www.gidluckmastering.com/live2496.html">Live2496</a>, a program that can record 24-bit audio up to 96kHz on a Pocket PC (using <a href="http://www.core-sound.com/">Core Sound's PDAudio interface</a>) can record directly to FLAC.</li>
+				</ul>
+			</li>
 		</ul>
 		<b>CD burning:</b>
 		<ul>
@@ -157,8 +169,14 @@
 				<b>Windows</b>
 				<ul>
 					<li><a href="http://www.burnatonce.com/">burnatonce</a>, a CD burning GUI that wraps around <a href="http://sourceforge.net/projects/cdrdao/">cdrdao</a> and <a href="http://freshmeat.net/projects/cdrecord/">mkisofs</a>.</li>
-					<li><a href="http://www.burrrn.net/">Burrrn</a> supports burning CDs from cuesheets directly from many formats, including FLAC, and supports most tag formats.</li>
+					<li><a href="http://www.burrrn.net/?page_id=4">Burrrn</a> supports burning CDs from cuesheets directly from many formats, including FLAC, and supports most tag formats.</li>
 					<li><a href="http://www.cdwave.com/">CD Wave</a>, a CD authoring tool that can read and write FLAC.</li>
+					<li><a href="http://dbpoweramp.com/cdwriter.htm">dBpowerAMP CD Writer</a>.</li>
+					<li>[$] <a href="http://www.nero.com/">Nero</a> (as a <a href="http://neroplugins.cd-rw.org/">plugin</a>); allows you to burn FLAC files directly to audio CDs.</li>
+				</ul>
+				<b>Mac OS X</b>
+				<ul>
+					<li>[$] Roxio's <a href="http://www.roxio.com/en/products/toast/index.jhtml">Toast 7 Titanium</a> supports encoding to FLAC and CD/DVD burning from FLAC.</li>
 				</ul>
 			</li>
 			<li>
@@ -168,7 +186,7 @@
 				</ul>
 			</li>
 		</ul>
-		<b>Third-party plugins:</b>
+		<b>Players and plugins:</b>
 		<ul>
 			<li>
 				<b>Windows</b>
@@ -176,14 +194,32 @@
 					<!-- case's page disappeared, use temporary links
 					<li><a href="http://www.saunalahti.fi/~cse/files/cool_flac.zip">Cooledit FLAC filter</a> (source code <a href="http://www.saunalahti.fi/cse/files/cool_flac_src.zip">here</a>).</li>
 					-->
-					<li><a href="http://www.hydrogenaudio.org/index.php?showtopic=20145">Cooledit FLAC filter</a>.</li>
-					<li><a href="http://corecodec.org/projects/coreflac">CoreFLAC</a>: DirectShow filters for encoding to/decoding from FLAC.</li>
-					<li><a href="http://www.illiminable.com/ogg/">DirectShow filters</a> for encoding to/decoding from FLAC and Ogg FLAC (as well as Ogg Vorbis/Speex/Theora).</li>
-					<li><a href="http://www.monsterfang.com/MCinFLAC/">Media Center/Media Jukebox FLAC plugin</a> and <a href="http://www.monsterfang.com/MCinFLAC/Encoding.htm">instructions</a> on how to encode to FLAC as well.  Source is also available.</li>
-					<li><a href="http://www.phsoft.nl/?id=flacplginf">Mp3CoolPlay-X FLAC plugin</a>.</li>
-					<li><a href="http://neroplugins.cd-rw.org/">Nero FLAC plugin</a> allows you to burn FLAC files directly to audio CDs.</li>
-					<li><a href="http://www.quinnware.com/plugins/in_qcdflac.exe">QCD FLAC plugin</a>.</li>
-					<li><a href="http://www.winamp.com/plugins/details.php?id=131643">FLAC Winamp3 plugin</a> by Giacomo Margarito.</li>
+					<li>[$] <a href="http://www.adobe.com/products/audition/main.html">Adobe Audition a.k.a. CoolEdit</a> (as a <a href="http://www.vuplayer.com/other.htm">plugin</a>, alternate plugin by Case <a href="http://www.hydrogenaudio.org/forums/index.php?showtopic=20145">here</a>)</li>
+					<li><a href="http://koti.welho.com/hylinen/apollo/">Apollo</a> (as a <a href="http://koti.welho.com/hylinen/apollo/Plug-ins.html">plugin</a>)</li>
+					<li><a href="http://www.dbpoweramp.com/dbpoweramp.htm">dbPowerAMP</a> (as a <a href="http://www.dbpoweramp.com/codec-central-flac.htm">plugin</a>)</li>
+					<li>DirectShow: <a href="http://www.illiminable.com/ogg/">Illiminable's DirectShow filters</a> for encoding to/decoding from FLAC and Ogg FLAC (as well as Ogg Vorbis/Speex/Theora).</li>
+					<li>DirectShow: <a href="http://corecodec.org/projects/coreflac">CoreFLAC</a>: DirectShow filters for encoding to/decoding from FLAC.</li>
+					<li><a href="http://www.foobar2000.org/">foobar2000</a> (as a <a href="http://www.foobar2000.org/components.html#foo_flac">plugin</a>)</li>
+					<li>[$] <a href="http://www.jrmediacenter.com/">Media Center</a>/<a href="http://www.mediajukebox.com/">Media Jukebox</a> (as <a href="http://mcplugins.sourceforge.net/">plugins</a>).  Source code is available.</li>
+					<li><a href="http://www.phsoft.nl/">Mp3CoolPlay-X</a> (as a <a href="http://www.phsoft.nl/?id=flacplginf">plugin</a>)</li>
+					<li><a href="http://www.quinnware.com/">Quintessential Player</a> (as a <a href="http://www.quinnware.com/list_plugins.php?plugin=126">plugin</a>)</li>
+					<li><a href="http://www.videolan.org/vlc/index.html">VLC</a></li>
+					<li><a href="http://www.vuplayer.com/vuplayer.htm">VUPlayer</a></li>
+					<li><a href="http://www.winamp.com/">Winamp</a> has native FLAC support</li>
+					<li>Windows Media Player, using either the <a href="http://www.illiminable.com/ogg/">Illiminable</a> or <a href="http://corecodec.org/projects/coreflac">CoreFLAC</a> DirectShow filters, and FLAC tag support with <a href="http://wmptagext.sourceforge.net/">WMP Tag Support Extender</a> (<a href="http://www.losslessaudioblog.com/?p=40">guide</a>)</li>
+					<li><a href="http://un4seen.com/xmplay.html">XMPlay</a> (as a <a href="http://un4seen.com/download.cgi?xmp-flac">plugin</a>)</li>
+					<li><a href="http://music.yahoo.com/musicengine/">Yahoo! Music Engine</a></li>
+				</ul>
+			</li>
+			<li>
+				<b>Mac OS X</b>
+				<ul>
+					<li><a href="http://cogosx.sourceforge.net/">Cog</a></li>
+					<li><a href="http://freshmeat.net/projects/cynthiune/">Cynthiune</a> music player</li>
+					<li><a href="http://arcticlounge.com/maltx/">MacAmp Lite X</a></li>
+					<li><a href="http://homepage.mac.com/steve_bryan/Personal12.html">PureMusic Audio Player</a></li>
+					<li><a href="http://www.videolan.org/vlc/index.html">VLC</a></li>
+					<li><a href="http://www.xiph.org/quicktime/">XiphQT</a> component for Quicktime/iTunes that supports Ogg FLAC</li>
 				</ul>
 			</li>
 			<li>
@@ -200,7 +236,23 @@
 
 
 <div class="copyright">
-	Copyright (c) 2000,2001,2002,2003,2004,2005,2006 Josh Coalson
+	<!-- @@@ oh so hacky -->
+	<table>
+		<tr>
+			<td align="left">
+				Copyright (c) 2000,2001,2002,2003,2004,2005,2006  Josh Coalson
+			</td>
+			<td width="1%" align="right">
+				<a href="http://sourceforge.net"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=13478&amp;type=1" width="88" height="31" border="0" alt="SourceForge.net Logo" /></a>
+			</td>
+			<td width="1%" align="right">
+				<a href="http://www.eff.org/cafe/"><img src="images/cafebug.gif" alt="CAFE Logo" border="0" /></a><br />
+			</td>
+			<td width="1%" align="right">
+				<a href="http://validator.w3.org/check?uri=referer"><img src="http://www.w3.org/Icons/valid-xhtml10" alt="Valid XHTML 1.0!" height="31" width="88" border="0" hspace="0" /></a>
+			</td>
+		</tr>
+	</table>
 </div>
 
 </body>
diff --git a/doc/html/faq.html b/doc/html/faq.html
index 18fc085..2ccff5e 100644
--- a/doc/html/faq.html
+++ b/doc/html/faq.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Copyright (c)  2000,2001,2002,2003,2004,2005,2006 Josh Coalson -->
+<!-- Copyright (c) 2000,2001,2002,2003,2004,2005,2006  Josh Coalson -->
 <!-- Permission is granted to copy, distribute and/or modify this document -->
 <!-- under the terms of the GNU Free Documentation License, Version 1.1 -->
 <!-- or any later version published by the Free Software Foundation; -->
@@ -289,7 +289,11 @@
 		<br />
 		<a name="tools__hardware_prob"><b>I compressed a file to FLAC with verify on, and flac said "Verify FAILED!"  Why?</b></a><br />
 		<br />
-		Every single report of this has turned out to be caused by a hardware problem, usually aggressive over-clocking or bad RAM.  The best indicator of this is that the verify failure does not always happen in the same place for the same file.  First, read the comments in <a href="http://sourceforge.net/tracker/index.php?func=detail&amp;aid=595858&amp;group_id=13478&amp;atid=113478">this bug report</a>.  Then, if you have a file that fails verification in the same place every time, <a href="#project__submit_bug">submit a new bug</a>, uploading a sample according to <a href="http://sourceforge.net/tracker/index.php?func=detail&amp;aid=585158&amp;group_id=13478&amp;atid=113478">the instructions found at the bottom of this bug report</a>.<br />
+		The only known cause of verify errors is faulty hardware.  The dead giveaway is that if you repeat the exact same command, the error occurs in a different place or not at all.  This can also happen when decoding or testing a FLAC file.  If this is happening it is your hardware and not a FLAC bug.<br />
+		<br />
+		The problem is usually caused by overclocking/overheating the CPU or bad RAM.  Try one of the many free programs available for testing hardware (e.g. <a href="http://www.memtest86.com/">Memtest86</a>).  We have had reports of a few cases where a system is passing with flying colors and still getting unrepeatable FLAC errors, and the one thing many (all?) of these systems have in common is an ASUS motherboard (A7V133 or P3V4X) which we suspect is buggy in some way.  (<a href="https://sourceforge.net/tracker/index.php?func=detail&amp;aid=884401&amp;group_id=13478&amp;atid=113478">See also</a>)<br />
+		<br />
+		If you ever have a verify error that fails at the same place every time, please <a href="#project__submit_bug">file a bug</a>, uploading a sample according to <a href="http://sourceforge.net/tracker/index.php?func=detail&amp;aid=585158&amp;group_id=13478&amp;atid=113478">the instructions found at the bottom of this bug report</a>.<br />
 		<br />
 		<a name="tools__wave_flac_wave"><b>I compressed a WAVE file to FLAC, then decompressed to WAVE, and the two weren't identical.  Why?</b></a><br />
 		<a name="tools__skipped_subchunk"><b>I compressed a WAVE file to FLAC and it said "warning: skipping unknown sub-chunk LIST".  Why?</b></a><br />
@@ -330,7 +334,7 @@
 
 		<a name="project__lists"><b>Where are the mailing lists, forums, discussion areas, etc.?</b></a><br />
 		<br />
-		There are a few places.  The main discussions happen on <a href="http://sourceforge.net/mail/?group_id=13478">the official FLAC mailing lists</a>.  Eventually we will be transitioning over to <a href="http://xiph.org/archives/">the lists on Xiph.org</a>.  Also, there is a lot of discussion relating to FLAC on <a href="http://www.hydrogenaudio.org/">Hydrogen Audio</a>.<br />
+		There are a few places.  The main discussions happen on <a href="http://lists.xiph.org/mailman/listinfo">the official FLAC mailing lists</a>.  Also, there is a lot of discussion relating to FLAC on <a href="http://www.hydrogenaudio.org/">Hydrogen Audio</a>.<br />
 		<br />
 		<a name="project__submit_bug"><b>How do I submit a bug report?</b></a><br />
 		<br />
@@ -341,7 +345,23 @@
 
 
 <div class="copyright">
-	Copyright (c) 2000,2001,2002,2003,2004,2005,2006 Josh Coalson
+	<!-- @@@ oh so hacky -->
+	<table>
+		<tr>
+			<td align="left">
+				Copyright (c) 2000,2001,2002,2003,2004,2005,2006  Josh Coalson
+			</td>
+			<td width="1%" align="right">
+				<a href="http://sourceforge.net"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=13478&amp;type=1" width="88" height="31" border="0" alt="SourceForge.net Logo" /></a>
+			</td>
+			<td width="1%" align="right">
+				<a href="http://www.eff.org/cafe/"><img src="images/cafebug.gif" alt="CAFE Logo" border="0" /></a><br />
+			</td>
+			<td width="1%" align="right">
+				<a href="http://validator.w3.org/check?uri=referer"><img src="http://www.w3.org/Icons/valid-xhtml10" alt="Valid XHTML 1.0!" height="31" width="88" border="0" hspace="0" /></a>
+			</td>
+		</tr>
+	</table>
 </div>
 
 </body>
diff --git a/doc/html/features.html b/doc/html/features.html
index 01c6c0e..da6fbaf 100644
--- a/doc/html/features.html
+++ b/doc/html/features.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Copyright (c)  2000,2001,2002,2003,2004,2005,2006 Josh Coalson -->
+<!-- Copyright (c) 2000,2001,2002,2003,2004,2005,2006  Josh Coalson -->
 <!-- Permission is granted to copy, distribute and/or modify this document -->
 <!-- under the terms of the GNU Free Documentation License, Version 1.1 -->
 <!-- or any later version published by the Free Software Foundation; -->
@@ -112,7 +112,23 @@
 
 
 <div class="copyright">
-	Copyright (c) 2000,2001,2002,2003,2004,2005,2006 Josh Coalson
+	<!-- @@@ oh so hacky -->
+	<table>
+		<tr>
+			<td align="left">
+				Copyright (c) 2000,2001,2002,2003,2004,2005,2006  Josh Coalson
+			</td>
+			<td width="1%" align="right">
+				<a href="http://sourceforge.net"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=13478&amp;type=1" width="88" height="31" border="0" alt="SourceForge.net Logo" /></a>
+			</td>
+			<td width="1%" align="right">
+				<a href="http://www.eff.org/cafe/"><img src="images/cafebug.gif" alt="CAFE Logo" border="0" /></a><br />
+			</td>
+			<td width="1%" align="right">
+				<a href="http://validator.w3.org/check?uri=referer"><img src="http://www.w3.org/Icons/valid-xhtml10" alt="Valid XHTML 1.0!" height="31" width="88" border="0" hspace="0" /></a>
+			</td>
+		</tr>
+	</table>
 </div>
 
 </body>
diff --git a/doc/html/format.html b/doc/html/format.html
index dc9e3ac..26659e3 100644
--- a/doc/html/format.html
+++ b/doc/html/format.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Copyright (c)  2000,2001,2002,2003,2004,2005,2006 Josh Coalson -->
+<!-- Copyright (c) 2000,2001,2002,2003,2004,2005,2006  Josh Coalson -->
 <!-- Permission is granted to copy, distribute and/or modify this document -->
 <!-- under the terms of the GNU Free Documentation License, Version 1.1 -->
 <!-- or any later version published by the Free Software Foundation; -->
@@ -149,7 +149,7 @@
 				N. Levinson and J. Durbin; the reference encoder uses an algorithm developed and refined by them for determining the LPC coefficients from the autocorrelation coefficients.
 			</li>
 			<li>
-				And of course, <a href="http://www.digitalcentury.com/encyclo/update/shannon.html">Claude Shannon</a>
+				And of course, <a href="http://en.wikipedia.org/wiki/Claude_Shannon">Claude Shannon</a>
 			</li>
 		</ul>
 		<a name="scope"><font size="+1"><b><u>Scope</u></b></font></a>
@@ -261,13 +261,13 @@
 			<li>
 				FLAC supports up to 128 kinds of metadata blocks; currently the following are defined:
 				<ul>
-					<li><a name="def_STREAMINFO" /><b>STREAMINFO</b>: This block has information about the whole stream, like sample rate, number of channels, total number of samples, etc.  It must be present as the first metadata block in the stream.  Other metadata blocks may follow, and ones that the decoder doesn't understand, it will skip.</li>
-					<li><a name="def_APPLICATION" /><b>APPLICATION</b>: This block is for use by third-party applications.  The only mandatory field is a 32-bit identifier.  This ID is granted upon request to an application by the FLAC maintainers.  The remainder is of the block is defined by the registered application.  Visit the <a href="id.html">registration page</a> if you would like to register an ID for your application with FLAC.</li>
-					<li><a name="def_PADDING" /><b>PADDING</b>: This block allows for an arbitrary amount of padding.  The contents of a PADDING block have no meaning.  This block is useful when it is known that metadata will be edited after encoding; the user can instruct the encoder to reserve a PADDING block of sufficient size so that when metadata is added, it will simply overwrite the padding (which is relatively quick) instead of having to insert it into the right place in the existing file (which would normally require rewriting the entire file).</li>
-					<li><a name="def_SEEKTABLE" /><b>SEEKTABLE</b>: This is an optional block for storing seek points.  It is possible to seek to any given sample in a FLAC stream without a seek table, but the delay can be unpredictable since the bitrate may vary widely within a stream.  By adding seek points to a stream, this delay can be significantly reduced.  Each seek point takes 18 bytes, so 1% resolution within a stream adds less than 2k.  There can be only one SEEKTABLE in a stream, but the table can have any number of seek points.  There is also a special 'placeholder' seekpoint which will be ignored by decoders but which can be used to reserve space for future seek point insertion.</li>
-					<li><a name="def_VORBIS_COMMENT" /><b>VORBIS_COMMENT</b>: This block is for storing a list of human-readable name/value pairs.  Values are encoded using UTF-8.  It is an implementation of the <a href="http://xiph.org/ogg/vorbis/doc/v-comment.html">Vorbis comment specification</a>.  This is the only officially supported tagging mechanism in FLAC.  There may be only one VORBIS_COMMENT block in a stream.  In some external documentation, Vorbis comments are called FLAC tags to lessen confusion.</li>
-					<li><a name="def_CUESHEET" /><b>CUESHEET</b>: This block is for storing various information that can be used in a cue sheet.  It supports track and index points, compatible with Red Book CD digital audio discs, as well as other CD-DA metadata such as media catalog number and track ISRCs.  The CUESHEET block is especially useful for backing up CD-DA discs, but it can be used as a general purpose cueing mechanism for playback.</li>
-					<li><a name="def_PICTURE" /><b>PICTURE</b>: This block is for storing pictures associated with the file, most commonly cover art from CDs.  There may be more than one PICTURE block in a file.  The picture format is similar to the <a href="http://www.id3.org/id3v2.4.0-frames.txt">APIC frame in ID3v2</a>.  The PICTURE block has a type, MIME type, and UTF-8 description like ID3v2, and supports external linking via URL (though this is discouraged).  The differences are that there is no uniqueness constraint on the description field, and the MIME type is mandatory.  The FLAC PICTURE block also includes the resolution, color depth, and palette size so that the client can search for a suitable picture without having to scan them all.</li>
+					<li><a name="def_STREAMINFO"><b>STREAMINFO</b></a>: This block has information about the whole stream, like sample rate, number of channels, total number of samples, etc.  It must be present as the first metadata block in the stream.  Other metadata blocks may follow, and ones that the decoder doesn't understand, it will skip.</li>
+					<li><a name="def_APPLICATION"><b>APPLICATION</b></a>: This block is for use by third-party applications.  The only mandatory field is a 32-bit identifier.  This ID is granted upon request to an application by the FLAC maintainers.  The remainder is of the block is defined by the registered application.  Visit the <a href="id.html">registration page</a> if you would like to register an ID for your application with FLAC.</li>
+					<li><a name="def_PADDING"><b>PADDING</b></a>: This block allows for an arbitrary amount of padding.  The contents of a PADDING block have no meaning.  This block is useful when it is known that metadata will be edited after encoding; the user can instruct the encoder to reserve a PADDING block of sufficient size so that when metadata is added, it will simply overwrite the padding (which is relatively quick) instead of having to insert it into the right place in the existing file (which would normally require rewriting the entire file).</li>
+					<li><a name="def_SEEKTABLE"><b>SEEKTABLE</b></a>: This is an optional block for storing seek points.  It is possible to seek to any given sample in a FLAC stream without a seek table, but the delay can be unpredictable since the bitrate may vary widely within a stream.  By adding seek points to a stream, this delay can be significantly reduced.  Each seek point takes 18 bytes, so 1% resolution within a stream adds less than 2k.  There can be only one SEEKTABLE in a stream, but the table can have any number of seek points.  There is also a special 'placeholder' seekpoint which will be ignored by decoders but which can be used to reserve space for future seek point insertion.</li>
+					<li><a name="def_VORBIS_COMMENT"><b>VORBIS_COMMENT</b></a>: This block is for storing a list of human-readable name/value pairs.  Values are encoded using UTF-8.  It is an implementation of the <a href="http://xiph.org/vorbis/doc/v-comment.html">Vorbis comment specification</a>.  This is the only officially supported tagging mechanism in FLAC.  There may be only one VORBIS_COMMENT block in a stream.  In some external documentation, Vorbis comments are called FLAC tags to lessen confusion.</li>
+					<li><a name="def_CUESHEET"><b>CUESHEET</b></a>: This block is for storing various information that can be used in a cue sheet.  It supports track and index points, compatible with Red Book CD digital audio discs, as well as other CD-DA metadata such as media catalog number and track ISRCs.  The CUESHEET block is especially useful for backing up CD-DA discs, but it can be used as a general purpose cueing mechanism for playback.</li>
+					<li><a name="def_PICTURE"><b>PICTURE</b></a>: This block is for storing pictures associated with the file, most commonly cover art from CDs.  There may be more than one PICTURE block in a file.  The picture format is similar to the <a href="http://www.id3.org/id3v2.4.0-frames.txt">APIC frame in ID3v2</a>.  The PICTURE block has a type, MIME type, and UTF-8 description like ID3v2, and supports external linking via URL (though this is discouraged).  The differences are that there is no uniqueness constraint on the description field, and the MIME type is mandatory.  The FLAC PICTURE block also includes the resolution, color depth, and palette size so that the client can search for a suitable picture without having to scan them all.</li>
 				</ul>
 			</li>
 			<li>
@@ -283,7 +283,7 @@
 				Individual subframes (one for each channel) are coded separately within a frame, and appear serially in the stream.  In other words, the encoded audio data is NOT channel-interleaved.  This reduces decoder complexity at the cost of requiring larger decode buffers.  Each subframe has its own header specifying the attributes of the subframe, like prediction method and order, residual coding parameters, etc.  The header is followed by the encoded audio data for that channel.
 			</li>
 			<li>
-				<a name="subset" />FLAC specifies a subset of itself as the Subset format.  The purpose of this is to ensure that any streams encoded according to the Subset are truly "streamable", meaning that a decoder that cannot seek within the stream can still pick up in the middle of the stream and start decoding.  It also makes hardware decoder implementations more practical by limiting the encoding parameters such that decoder buffer sizes and other resource requirements can be easily determined.  "flac" generates Subset streams by default unless the "--lax" command-line option is used.  The Subset makes the following limitations on what may be used in the stream:
+				<a name="subset">FLAC</a> specifies a subset of itself as the Subset format.  The purpose of this is to ensure that any streams encoded according to the Subset are truly "streamable", meaning that a decoder that cannot seek within the stream can still pick up in the middle of the stream and start decoding.  It also makes hardware decoder implementations more practical by limiting the encoding parameters such that decoder buffer sizes and other resource requirements can be easily determined.  "flac" generates Subset streams by default unless the "--lax" command-line option is used.  The Subset makes the following limitations on what may be used in the stream:
 				<ul>
 				<li>
 					The blocksize bits in the <a href="#frame_header">frame header</a> must be 0001-0101 or 1000-1110, specifying a fixed-blocksize stream (the exception being the last block as described in the table) and a few allowable blocksizes.  This also means that the STREAMINFO metadata block must specify equal mininum and maximum blocksizes.  If the sample rate is &lt;= 48000Hz, the blocksize must be &lt;=4608, i.e. blocksize bits 0001-0101 or 1000-1100.
@@ -738,7 +738,7 @@
 				&lt;n&gt;
 			</td>
 			<td>
-				Also known as FLAC tags, the contents of a vorbis comment packet as specified <a href="http://www.xiph.org/ogg/vorbis/doc/v-comment.html">here</a>, including the vendor string.  Note that the vorbis comment spec allows for on the order of 2 ^ 64 bytes of data where as the FLAC metadata block is limited to 2 ^ 24 bytes.  Given the stated purpose of vorbis comments, i.e. human-readable textual information, this limit is unlikely to be restrictive.  Also note that the 32-bit field lengths are little-endian coded according to the vorbis spec, as opposed to the usual big-endian coding of fixed-length integers in the rest of FLAC.
+				Also known as FLAC tags, the contents of a vorbis comment packet as specified <a href="http://www.xiph.org/vorbis/doc/v-comment.html">here</a>, including the vendor string.  Note that the vorbis comment spec allows for on the order of 2 ^ 64 bytes of data where as the FLAC metadata block is limited to 2 ^ 24 bytes.  Given the stated purpose of vorbis comments, i.e. human-readable textual information, this limit is unlikely to be restrictive.  Also note that the 32-bit field lengths are little-endian coded according to the vorbis spec, as opposed to the usual big-endian coding of fixed-length integers in the rest of FLAC.
 			</td>
 		</tr>
 	</table>
@@ -1722,7 +1722,23 @@
 
 
 <div class="copyright">
-	Copyright (c) 2000,2001,2002,2003,2004,2005,2006 Josh Coalson
+	<!-- @@@ oh so hacky -->
+	<table>
+		<tr>
+			<td align="left">
+				Copyright (c) 2000,2001,2002,2003,2004,2005,2006  Josh Coalson
+			</td>
+			<td width="1%" align="right">
+				<a href="http://sourceforge.net"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=13478&amp;type=1" width="88" height="31" border="0" alt="SourceForge.net Logo" /></a>
+			</td>
+			<td width="1%" align="right">
+				<a href="http://www.eff.org/cafe/"><img src="images/cafebug.gif" alt="CAFE Logo" border="0" /></a><br />
+			</td>
+			<td width="1%" align="right">
+				<a href="http://validator.w3.org/check?uri=referer"><img src="http://www.w3.org/Icons/valid-xhtml10" alt="Valid XHTML 1.0!" height="31" width="88" border="0" hspace="0" /></a>
+			</td>
+		</tr>
+	</table>
 </div>
 
 </body>
diff --git a/doc/html/goals.html b/doc/html/goals.html
index 4d435ef..0bf7092 100644
--- a/doc/html/goals.html
+++ b/doc/html/goals.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Copyright (c)  2000,2001,2002,2003,2004,2005,2006 Josh Coalson -->
+<!-- Copyright (c) 2000,2001,2002,2003,2004,2005,2006  Josh Coalson -->
 <!-- Permission is granted to copy, distribute and/or modify this document -->
 <!-- under the terms of the GNU Free Documentation License, Version 1.1 -->
 <!-- or any later version published by the Free Software Foundation; -->
@@ -94,7 +94,23 @@
 
 
 <div class="copyright">
-	Copyright (c) 2000,2001,2002,2003,2004,2005,2006 Josh Coalson
+	<!-- @@@ oh so hacky -->
+	<table>
+		<tr>
+			<td align="left">
+				Copyright (c) 2000,2001,2002,2003,2004,2005,2006  Josh Coalson
+			</td>
+			<td width="1%" align="right">
+				<a href="http://sourceforge.net"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=13478&amp;type=1" width="88" height="31" border="0" alt="SourceForge.net Logo" /></a>
+			</td>
+			<td width="1%" align="right">
+				<a href="http://www.eff.org/cafe/"><img src="images/cafebug.gif" alt="CAFE Logo" border="0" /></a><br />
+			</td>
+			<td width="1%" align="right">
+				<a href="http://validator.w3.org/check?uri=referer"><img src="http://www.w3.org/Icons/valid-xhtml10" alt="Valid XHTML 1.0!" height="31" width="88" border="0" hspace="0" /></a>
+			</td>
+		</tr>
+	</table>
 </div>
 
 </body>
diff --git a/doc/html/id.html b/doc/html/id.html
index d93d636..dcc3fe7 100644
--- a/doc/html/id.html
+++ b/doc/html/id.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Copyright (c)  2000,2001,2002,2003,2004,2005,2006 Josh Coalson -->
+<!-- Copyright (c) 2000,2001,2002,2003,2004,2005,2006  Josh Coalson -->
 <!-- Permission is granted to copy, distribute and/or modify this document -->
 <!-- under the terms of the GNU Free Documentation License, Version 1.1 -->
 <!-- or any later version published by the Free Software Foundation; -->
@@ -77,7 +77,7 @@
 					<td>Comment:</td>
 				</tr>
 				<tr>
-					<td><textarea name="comment" cols="72" rows="5" /></td>
+					<td><textarea name="comment" cols="72" rows="5"></textarea></td>
 				</tr>
 				<tr>
 					<td>(* = mandatory)</td>
@@ -100,7 +100,7 @@
 
 <div class="box">
 	<div class="box_title">
-		<a name="directory" />id directory
+		<a name="directory">id directory</a>
 	</div>
 	<div class="box_header"></div>
 	<div class="box_body">
@@ -118,6 +118,14 @@
 			</tr>
 			<tr>
 				<td nowrap="nowrap" align="right" valign="top" bgcolor="#F4F4CC">
+					<tt>41544348 - "ATCH"</tt>
+				</td>
+				<td>
+					<a href="http://firestuff.org/flacfile/">FlacFile</a>
+				</td>
+			</tr>
+			<tr>
+				<td nowrap="nowrap" align="right" valign="top" bgcolor="#F4F4CC">
 					<tt>43756573 - "Cues"</tt>
 				</td>
 				<td>
@@ -126,6 +134,22 @@
 			</tr>
 			<tr>
 				<td nowrap="nowrap" align="right" valign="top" bgcolor="#F4F4CC">
+					<tt>4D754D4C - "MuML"</tt>
+				</td>
+				<td>
+					MusicML: Music Metadata Language
+				</td>
+			</tr>
+			<tr>
+				<td nowrap="nowrap" align="right" valign="top" bgcolor="#F4F4CC">
+					<tt>46696361 - "Fica"</tt>
+				</td>
+				<td>
+					<a href="http://www.enfis.it/details.php?id=24">CUE Splitter</a>
+				</td>
+			</tr>
+			<tr>
+				<td nowrap="nowrap" align="right" valign="top" bgcolor="#F4F4CC">
 					<tt>46746F6C - "Ftol"</tt>
 				</td>
 				<td>
@@ -134,6 +158,14 @@
 			</tr>
 			<tr>
 				<td nowrap="nowrap" align="right" valign="top" bgcolor="#F4F4CC">
+					<tt>4D505345 - "MPSE"</tt>
+				</td>
+				<td>
+					<a href="http://www.3delite.hu/MP3SE/index.html">MP3 Stream Editor</a>
+				</td>
+			</tr>
+			<tr>
+				<td nowrap="nowrap" align="right" valign="top" bgcolor="#F4F4CC">
 					<tt>5346464C - "SFFL"</tt>
 				</td>
 				<td>
@@ -142,6 +174,14 @@
 			</tr>
 			<tr>
 				<td nowrap="nowrap" align="right" valign="top" bgcolor="#F4F4CC">
+					<tt>5351455A - "SQEZ"</tt>
+				</td>
+				<td>
+					flacsqueeze
+				</td>
+			</tr>
+			<tr>
+				<td nowrap="nowrap" align="right" valign="top" bgcolor="#F4F4CC">
 					<tt>7065656D - "peem"</tt>
 				</td>
 				<td>
@@ -150,6 +190,22 @@
 			</tr>
 			<tr>
 				<td nowrap="nowrap" align="right" valign="top" bgcolor="#F4F4CC">
+					<tt>74756E65 - "tune"</tt>
+				</td>
+				<td>
+					<a href="http://www.tagtuner.com/">TagTuner</a>
+				</td>
+			</tr>
+			<tr>
+				<td nowrap="nowrap" align="right" valign="top" bgcolor="#F4F4CC">
+					<tt>78626174 - "xbat"</tt>
+				</td>
+				<td>
+					<a href="http://xbat.org/">XBAT</a>
+				</td>
+			</tr>
+			<tr>
+				<td nowrap="nowrap" align="right" valign="top" bgcolor="#F4F4CC">
 					<tt>786D6364 - "xmcd"</tt>
 				</td>
 				<td>
@@ -174,7 +230,23 @@
 
 
 <div class="copyright">
-	Copyright (c) 2000,2001,2002,2003,2004,2005,2006 Josh Coalson
+	<!-- @@@ oh so hacky -->
+	<table>
+		<tr>
+			<td align="left">
+				Copyright (c) 2000,2001,2002,2003,2004,2005,2006  Josh Coalson
+			</td>
+			<td width="1%" align="right">
+				<a href="http://sourceforge.net"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=13478&amp;type=1" width="88" height="31" border="0" alt="SourceForge.net Logo" /></a>
+			</td>
+			<td width="1%" align="right">
+				<a href="http://www.eff.org/cafe/"><img src="images/cafebug.gif" alt="CAFE Logo" border="0" /></a><br />
+			</td>
+			<td width="1%" align="right">
+				<a href="http://validator.w3.org/check?uri=referer"><img src="http://www.w3.org/Icons/valid-xhtml10" alt="Valid XHTML 1.0!" height="31" width="88" border="0" hspace="0" /></a>
+			</td>
+		</tr>
+	</table>
 </div>
 
 </body>
diff --git a/doc/html/index.html b/doc/html/index.html
index c09a83d..4938623 100644
--- a/doc/html/index.html
+++ b/doc/html/index.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Copyright (c)  2000,2001,2002,2003,2004,2005,2006 Josh Coalson -->
+<!-- Copyright (c) 2000,2001,2002,2003,2004,2005,2006  Josh Coalson -->
 <!-- Permission is granted to copy, distribute and/or modify this document -->
 <!-- under the terms of the GNU Free Documentation License, Version 1.1 -->
 <!-- or any later version published by the Free Software Foundation; -->
@@ -53,23 +53,33 @@
 
 			<div class="box">
 				<div class="box_title">
-					status
+					<a name="status">status</a>
 				</div>
 				<div class="box_header"></div>
 				<div class="box_body">
+					<a href="http://winamp.com/player/">Winamp 5.31</a> now includes Nullsoft FLAC plugins for encoding and decoding.  The decoder is based on our reference decoder plugin.  However the current encoder plugin is based on a pre-release of <a href="http://flake-enc.sourceforge.net/">flake</a> and we <a href="http://www.hydrogenaudio.org/forums/index.php?s=&showtopic=45013&view=findpost&p=443961">recommend to not use it for archival</a> yet.
+					<br /><br />
+					The new <a href="http://www.neodigits.com/new/body/products/Xline/x5000.asp">Helios X5000</a> HD network media player from Neodigits supports FLAC</a>.
+					<br /><br />
+					The <a href="http://www.thephiladelphiaorchestra.com/">Philadelphia Orchestra</a> is making many recordings <a href="http://www.losslessaudioblog.com/?p=109">available in FLAC</a>.
+					<br /><br />
+					A whole new batch of devices and stores support FLAC: for portables there are the <a href="http://www.cowonamerica.com/products/iaudio/t2/">iAUDIO T2</a> and <a href="http://www.cowonglobal.com/product/product_F2_feature.php">iAUDIO F2</a>, TrekStor's <a href="http://www.trekstor.de/en/products/detail_mp3.php?pid=66">Vibez</a>, the <a href="http://www.anythingbutipod.com/archives/2006/09/onda-vx737-gaming-pmp.php">Onda VX737</a>, and the <a href="http://www.apod.com.cn/show_products.asp?photoID=437">AP3000</a> from Green Apple.  For the home stereo, Slim Devices' <a href="http://www.slimdevices.com/pi_transporter.html">Transporter</a> and Ziova's <a href="http://www.ziova.com/cs510.php">CS510</a> and <a href="http://www.ziova.com/cs505.php">CS505</a>.  For music in FLAC format check out <a href="http://www.digital-tunes.net/">digital-tunes</a> for electronic and underground, or <a href="http://festivalink.net/">FestivaLink.net</a> for live shows.
+					<br /><br />
+					Bluedot's <a href="http://www.digitalworldtokyo.com/2006/07/bluedot_pmp_runs_linux_loves.php">BMP-1430</a> portable supports FLAC.
+					<br /><br />
+					AudioReQuest's new <a href="http://www.request.com/products/sseries.asp">S.Series</a> music servers support FLAC.
+					<br /><br />
+					Cowon's <a href="http://www.cowonamerica.com/products/cowon/a2/tech_specs.html">A2</a> now supports FLAC with the <a href="http://www.cowonamerica.com/download/cowon_rn_a2.html">latest firmware</a>, and Olive's new <a href="http://www.olive.us/p_bin/?cid=01_07_opus">Opus</a> both plays and records to FLAC.
+					<br /><br />
+					The new <a href="http://gaming.engadget.com/2006/01/22/iwod-g10-pmp-with-nes-emulator/">Iwod G10</a> portable supports FLAC.
+					<br /><br />
+					Want some FLAC with your Volvo?  Volvo's <a href="http://www.volvocars.com/DigitalJukebox/product_information/">Digital Jukebox</a>, developed with <a href="http://www.phatnoise.com/">PhatNoise</a>, is fully integrated with the car's audio system and available for the S60, V70, XC70, and S80.  PhatNoise's PhatBox in 2002 was the <a href="news.html#20020213">first device</a> to support FLAC natively and has gained a loyal following.
+					<br /><br />
+<!--
 					FLAC 1.1.2 is available.  New in this release are small decoding speedups for all platforms, small encoding speedups in fast (non-LPC) mode, streaming support in the XMMS plugin, and several bug fixes.  For developers there are also a few additions and changes to the metadata API to make working with tags easier.  See the <a href="changelog.html#flac_1_1_2">changelog entry</a> for complete details.  This release actually wasn't supposed to happen so soon, but needed to be made to fix library naming and build problems in FLAC 1.1.1 that caused trouble for package maintainers, so unless you are having trouble with one of the particular bugs that got fixed in 1.1.2 then there is not much of a need to upgrade.
 					<br /><br />
-					Another handful of devices that support FLAC are out or announced: <!--the a href="http://www.planetminidisc.com/chroma-20gb.html"@Rio Chroma@/A, -->the <a href="http://www.zensonic.com/press_z500.php">Zensonic Z500 Networked DVD Media Player</a>, Escient's <a href="http://www.escient.com/releases/escient_jan0605_2.html">new FireBall E2-40, E2-160, and DVDM-300</a>, the <a href="http://www.digitaltechniques.com/M300A_Overview.html">M300A Digital Music Player</a> from Digital Techniques (see <a href="http://www.digitaltechniques.com/QuickStart.html">manual</a>), Meda Systems' <a href="http://www.medainc.com/">Bravo servers</a> (<a href="http://www.stereophile.com/news/092704medasystems/">more info</a>), and the <a href="http://www.cesweb.org/attendees/show_floor/product_locator/product_details.asp?prodid=5181">MS300 Music Server</a> by McIntosh Laboratory.
-					<br /><br />
-					We just found out that <a href="http://www.skipjam.com/">SkipJam</a>'s line of networked audio/video components supports FLAC.  (Even though it's not mentioned on their site, I'm assured that's just because the site hasn't been updated yet.)
-					<br /><br />
-					<a href="http://www.escient.com/">Escient</a> has a new home stereo component that supports FLAC, the <a href="http://www.escient.com/fireballe2300.html">FireBall E2-300</a>.
-					<br /><br />
-					<a href="http://www.mindawn.com/">Mindawn</a>, a new online music service offering FLAC and Ogg Vorbis, is now open.  They also have a multi-platform (Windows, Linux, Mac OS X) CD ripper/encoder and are finishing up a multi-platform player.
-					<br /><br />
-					Illiminable has updated his excellent <a href="http://www.illiminable.com/ogg/">Directshow filters</a> to support native FLAC (in addition to Ogg FLAC/Vorbis/Speex/Theora).
-					<br /><br />
-					<i>last updated 2005-Feb-05</i> <!-- @@@ remember to update the date after changes -->
+-->
+					<i>last updated 2006-Oct-25</i> <!-- @@@ update date after changes -->
 				</div>
 				<div class="box_footer"></div>
 			</div>
@@ -78,7 +88,7 @@
 
 			<div class="box">
 				<div class="box_title">
-					what is FLAC?
+					<a name="what_is_flac">what is FLAC?</a>
 				</div>
 				<div class="box_header"></div>
 				<div class="box_body">
@@ -107,7 +117,7 @@
 
 			<div class="box">
 				<div class="box_title">
-					download
+					<a name="download">download</a>
 				</div>
 				<div class="box_header"></div>
 				<div class="box_body">
@@ -120,7 +130,7 @@
 
 			<div class="box">
 				<div class="box_title">
-					documentation
+					<a name="documentation">documentation</a>
 				</div>
 				<div class="box_header"></div>
 				<div class="box_body">
@@ -133,7 +143,7 @@
 
 			<div class="box">
 				<div class="box_title">
-					id registration
+					<a name="id">id registration</a>
 				</div>
 				<div class="box_header"></div>
 				<div class="box_body">
@@ -153,6 +163,15 @@
 				</div>
 				<div class="smallbox_header"></div>
 				<div class="smallbox_body">
+					<a href="news.html#20061025">25-Oct-2006</a> :<br />Winamp 5.31 ships with FLAC support<br /><br />
+					<a href="news.html#20051220">20-Dec-2005</a> :<br />Volvo's Digital Jukebox plays FLAC<br /><br />
+					<a href="news.html#20050921">21-Sep-2005</a> :<br />Live2496 now records directly to FLAC<br /><br />
+					<a href="news.html#20050810">10-Aug-2005</a> :<br />Olive's new Symphony component supports FLAC<br /><br />
+					<a href="news.html#20050511">11-May-2005</a> :<br />YME supports FLAC and Vorbis<br /><br />
+					<a href="news.html#20050510">10-May-2005</a> :<br />PONTIS' MS330 supports FLAC and Vorbis<br /><br />
+					<a href="news.html#20050502">02-May-2005</a> :<br />Sonos now supports FLAC and Vorbis<br /><br />
+					<a href="news.html#20050423">23-Apr-2005</a> :<br />iAUDIO X5 portable supports FLAC and Vorbis<br /><br />
+					<a href="news.html#20050309">09-Mar-2005</a> :<br />Squeezebox2 supports FLAC on the box<br /><br />
 					<a href="news.html#20050205">05-Feb-2005</a> :<br />Version 1.1.2 released<br /><br />
 					<a href="news.html#20050117">17-Jan-2005</a> :<br />Several new devices support FLAC<br /><br />
 					<a href="news.html#20041112">12-Nov-2004</a> :<br />Escient's new FireBall E2-300 supports FLAC<br /><br />
@@ -176,22 +195,28 @@
 				<div class="smallbox_footer"></div>
 			</div>
 
-			<br />
-
-			<div>
-				<a href="http://sourceforge.net"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=13478&amp;type=1" alt="SourceForge Logo" width="88" height="31" border="0" /></a>
-			</div>
-
-			<br />
-
-			<a href="http://www.eff.org/cafe/"><img src="images/cafebug.gif" alt="CAFE Logo" border="0" /></a><br />
-
 		</td>
 	</tr>
 </table>
 
 <div class="copyright">
-	Copyright (c) 2000,2001,2002,2003,2004,2005,2006 Josh Coalson
+	<!-- @@@ oh so hacky -->
+	<table>
+		<tr>
+			<td align="left">
+				Copyright (c) 2000,2001,2002,2003,2004,2005,2006  Josh Coalson
+			</td>
+			<td width="1%" align="right">
+				<a href="http://sourceforge.net"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=13478&amp;type=1" width="88" height="31" border="0" alt="SourceForge.net Logo" /></a>
+			</td>
+			<td width="1%" align="right">
+				<a href="http://www.eff.org/cafe/"><img src="images/cafebug.gif" alt="CAFE Logo" border="0" /></a><br />
+			</td>
+			<td width="1%" align="right">
+				<a href="http://validator.w3.org/check?uri=referer"><img src="http://www.w3.org/Icons/valid-xhtml10" alt="Valid XHTML 1.0!" height="31" width="88" border="0" hspace="0" /></a>
+			</td>
+		</tr>
+	</table>
 </div>
 
 </body>
diff --git a/doc/html/license.html b/doc/html/license.html
index 9f0e616..8fe30f4 100644
--- a/doc/html/license.html
+++ b/doc/html/license.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Copyright (c)  2004,2005,2006 Josh Coalson -->
+<!-- Copyright (c) 2004,2005,2006  Josh Coalson -->
 <!-- Permission is granted to copy, distribute and/or modify this document -->
 <!-- under the terms of the GNU Free Documentation License, Version 1.1 -->
 <!-- or any later version published by the Free Software Foundation; -->
@@ -74,7 +74,23 @@
 
 
 <div class="copyright">
-	Copyright (c) 2004,2005,2006 Josh Coalson
+	<!-- @@@ oh so hacky -->
+	<table>
+		<tr>
+			<td align="left">
+				Copyright (c) 2004,2005,2006  Josh Coalson
+			</td>
+			<td width="1%" align="right">
+				<a href="http://sourceforge.net"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=13478&amp;type=1" width="88" height="31" border="0" alt="SourceForge.net Logo" /></a>
+			</td>
+			<td width="1%" align="right">
+				<a href="http://www.eff.org/cafe/"><img src="images/cafebug.gif" alt="CAFE Logo" border="0" /></a><br />
+			</td>
+			<td width="1%" align="right">
+				<a href="http://validator.w3.org/check?uri=referer"><img src="http://www.w3.org/Icons/valid-xhtml10" alt="Valid XHTML 1.0!" height="31" width="88" border="0" hspace="0" /></a>
+			</td>
+		</tr>
+	</table>
 </div>
 
 </body>
diff --git a/doc/html/links.html b/doc/html/links.html
index d21dfc6..1de241b 100644
--- a/doc/html/links.html
+++ b/doc/html/links.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Copyright (c)  2004,2005,2006 Josh Coalson -->
+<!-- Copyright (c) 2004,2005,2006  Josh Coalson -->
 <!-- Permission is granted to copy, distribute and/or modify this document -->
 <!-- under the terms of the GNU Free Documentation License, Version 1.1 -->
 <!-- or any later version published by the Free Software Foundation; -->
@@ -60,51 +60,80 @@
 
 <br />
 
-<a name="hardware" />
 <div class="box">
 	<div class="box_title">
-		hardware
+		<a name="hardware">hardware</a>
 	</div>
 	<div class="box_header"></div>
 	<div class="box_body">
-		Below is a list of devices that support the FLAC format.  So far we only have experience with the Rio Reciever.  Manufacturers, if you would like your product reviewed here, feel free to <a href="mailto:jcoalson@users.sourceforge.net">send a unit</a>.<br />
+		Below is a list of devices that support the FLAC format.  So far we only have experience with the Squeezebox2 and Rio Reciever; see <a href="#review">reviews</a> below.  Manufacturers, if you would like your product reviewed here, feel free to <a href="mailto:jcoalson@users.sourceforge.net">send a unit</a>.<br />
 		<br />
 		<b>Home stereo:</b>
 		<ul>
-			<li><a href="http://www.request.com/us/">AudioReQuest</a> music servers</li>
-			<li>Digital Techniques' "iStereo" <a href="http://www.digitaltechniques.com/M300A_Overview.html">M300A Digital Music Player</a></li>
-			<li>Escient's <a href="http://www.escient.com/">FireBall servers (E2-40/160/300, DVDM-300)</a>, networked home stereo components with hard-drives</li>
+			<li><a href="http://www.request.com/">AudioReQuest</a> music servers</li>
+			<li><a href="http://www.avegasystems.com/">Avega Systems'</a> wireless <a href="http://www.avegasystems.com/_documents/Oyster_Specifications.pdf">Oyster</a> loudspeakers</li>
+			<!--
+				http://www.avegasystems.com/_documents/Oyster_Specifications.pdf
+				http://www.avegasystems.com/_documents/Oyster_FAQ.pdf
+			-->
+			<li>Digital Techniques' <a href="http://www.digitaltechniques.com/Products.html">Blackbird Digital Music Players</a></li>
+			<li>Escient's <a href="http://www.escient.com/">FireBall servers (E2-40/160/300, DVDM-300, SE-D1)</a>, networked home stereo components with hard-drives</li>
 			<li><a href="http://www.hermstedt.com/english/hifidelio/hifidelio.html">Hifidelio</a>, a wireless home stereo component</li>
+			<li><a href="http://www.imuse.us/">iMuse</a> audio/video media servers</li>
 			<li>Meda Systems' <a href="http://www.medainc.com/">Bravo servers</a></li>
-			<li>The <a href="http://www.cesweb.org/attendees/show_floor/product_locator/product_details.asp?prodid=5181">MS300 Music Server</a> by McIntosh Laboratory</li>
+			<li>The <a href="http://www.mcintoshlabs.com/mcprod/shopdisplayproducts.asp?id=19&amp;cat=Sources&amp;prodid=1113&amp;product=MS300">MS300 Music Server</a> by McIntosh Laboratory (<a href="http://www.mcintoshlabs.com/mcprod/..\data\brochures\ms300techsheet.pdf">brochure</a>)</li>
+			<li><a href="http://www.olive.us/">Olive</a>'s Opus, Symphony, and Musica wireless digital music centers</li>
 			<li><a href="http://www.phatnoise.com/products/homeplayer/index.php">PhatNoise Home Digital Media Player</a></li>
-			<li><a href="http://www.mock.com/receiver/">Rio Reciever</a> and Dell Digital Audio Receiver via <a href="http://sourceforge.net/projects/rioplay/">RioPlay</a> or <a href="http://www.reza.net/rio/rrr.html">RRR</a> clients<br />This little device is a hacker's dream.  There are several open source clients available and since it boots its Linux distro over NFS you can write your own client.  They're not made anymore but you can still find them on ebay.</li>
-			<li><a href="http://www.rokulabs.com/">Roku Soundbridge</a></li>
+			<li>PONTIS' <a href="http://www.pontis.de/site_e/produkte/ms_330_e.htm">MS330 Media Server</a></li>
+			<li>Neodigits' <a href="http://www.neodigits.com/new/body/products/Xline/x5000.asp">Helios X5000</a> HD network media player</a>.
+			<li><a href="http://www.numark.com/">Numark</a>'s DJ equipment like the HDX and CDX turntables with integrated hard drive and CD player, and the HDMIX mixer</li>
+			<li><a href="http://www.mock.com/receiver/">Rio Reciever</a> and Dell Digital Audio Receiver via <a href="http://sourceforge.net/projects/rioplay/">RioPlay</a>, <a href="http://www.reza.net/rio/rrr.html">RRR</a>, <a href="http://sourceforge.net/projects/triot/">tRio</a>, or <a href="http://www.xplhal.com/xplrionet.htm">xPLRio.net</a> clients (<a href="#review_rio_receiver">review</a>)</li>
+			<li><a href="http://www.rokulabs.com/products/photobridge/features.php">Roku Photobridge HD</a> via <a href="http://homepage.ntlworld.ie/p.mc.quillan/FLAC_V0.7.zip">plugin</a></li>
+			<li><a href="http://www.rokulabs.com/">Roku Soundbridge(*)</a></li>
 			<li><a href="http://www.skipjam.com/">SkipJam</a>'s networked audio/video devices</li>
-			<li><a href="http://www.slimdevices.com/">Squeezebox and SliMP3</a> networked audio players</li>
-			<li>Turtle Beach's <a href="http://www.turtlebeach.com/site/products/audiotron/producthome.asp">AudioTron</a> via Bery Rinaldo's <a href="http://file-ext-map.sourceforge.net/">Samba VFS Module</a></li>
+			<li><a href="http://www.sonos.com/">Sonos Digital Music System</a></li>
+			<li>Slim Devices' <a href="http://www.slimdevices.com/pi_transporter.html">Transporter</a> and <a href="http://www.slimdevices.com/pi_squeezebox.html">Squeezebox</a> networked audio players (<a href="#review_squeezebox2">review</a>)</li>
+			<li>Turtle Beach's <a href="http://www.turtlebeach.com/site/products/audiotron/producthome.asp">AudioTron(*)</a> via Bery Rinaldo's <a href="http://file-ext-map.sourceforge.net/">Samba VFS Module</a></li>
 			<li><a href="http://www.z500series.com/">Zensonic Z500 Networked DVD Media Player</a></li>
+			<li>Ziova's <a href="http://www.ziova.com/cs510.php">CS510</a> and <a href="http://www.ziova.com/cs505.php">CS505</a> network media players</li>
+			<li>(*) <i>device decodes FLAC to WAVE/PCM on server-side</i></li>
+			<li>(**) <i>device decodes FLAC to MP3 on server-side</i></li>
 		</ul>
 		<b>Car stereo:</b>
 		<ul>
 			<li><a href="http://www.phatnoise.com/products/digitalmediaplayers/kenwood_music_keg.php">Kenwood Music Keg</a></li>
 			<li><a href="http://www.phatnoise.com/products/digitalmediaplayers/index.php">PhatBox</a></li>
+			<li><a href="http://www.cdd.ru/">URAL ConceRt CDD</a></li>
+			<li>Volvo's <a href="http://www.volvocars.com/DigitalJukebox/product_information/">Digital Jukebox</a></li>
 		</ul>
 		<b>Portable/Handheld:</b>
 		<ul>
-			<li><a href="http://www.jetaudio.com/products/iaudio/m3/">iAUDIO M3</a></li>
+			<li>Bluedot's <a href="http://www.digitalworldtokyo.com/2006/07/bluedot_pmp_runs_linux_loves.php">BMP-1430</a></li>
+			<li>COWON's <a href="http://www.cowonamerica.com/products/cowon/a2/">iAUDIO A2</a>, <a href="http://www.cowonglobal.com/product/product_F2_feature.php">iAUDIO F2</a>, <a href="http://www.cowonamerica.com/products/iaudio/u3/">iAUDIO U3</a>, <a href="http://www.jetaudio.com/products/iaudio/m3/">iAUDIO M3</a>, <a href="http://www.cowonamerica.com/products/iaudio/m5/">iAUDIO M5</a>, <a href="http://www.cowonamerica.com/products/iaudio/t2/">iAUDIO T2</a>, and <a href="http://www.cowonamerica.com/products/iaudio/x5/">iAUDIO X5</a></li>
+			<li>Green Apple's portable media player: <a href="http://www.apod.com.cn/show_products.asp?photoID=437">AP3000</a></li>
+			<li>iPod via the <a href="http://www.rockbox.org/">Rockbox</a> firmware replacement</li>
+			<li>iRiver iHP-120/iHP-140/H320/H340 via the <a href="http://www.rockbox.org/">Rockbox</a> firmware replacement</li>
+			<li><a href="http://gaming.engadget.com/2006/01/22/iwod-g10-pmp-with-nes-emulator/">Iwod G10</a></li>
+			<li>Onda <a href="http://www.anythingbutipod.com/archives/2006/09/onda-vx737-gaming-pmp.php">VX737</a></li>
 			<li><a href="http://www.digitalnetworksna.com/shop/_templates/item_main_Rio.asp?model=220&amp;cat=53">Rio Karma</a><!-- and Rio Chroma--></li>
+			<li>TrekStor's <a href="http://www.trekstor.de/en/products/detail_mp3.php?pid=66">Vibez</a></li>
 		</ul>
+		<a name="review"><b>Reviews:</b></a>
+		<br /><br />
+		The main purpose of these reviews is to give an idea of how well particular devices support FLAC.  Other subjective comments here are based on our general impressions and are not meant to be thorough or authoritative.  We only review devices we have tested directly ourselves.
+		<br /><br />
+		<a name="review_rio_receiver"><a href="http://www.mock.com/receiver/"><b>Rio Reciever</b></a></a>: This little device is a hacker's dream.  It plays audio over a network (Ethernet or HPNA) so it requires a PC to serve audio files.  There are several open source clients available and since it boots its Linux distro over NFS you can write your own client.  They're not made anymore but you can still find them on ebay.  The main downsides: 1) small, hard-to-read LCD display; 2) FLAC support is only in third-party clients which take some work to set up.
+		<br /><br />
+		<a name="review_squeezebox2"><a href="http://www.slimdevices.com/"><b>Squeezebox2</b></a></a>: A fantastic networked audio player.  Has an excellent, easy-to-read vacuum fluorescent display, wired or wireless networking, optical and coax digital outs and analog out, a reputation for very high audio quality, multi-room synchronization, and a bunch of other features.  The server-side software, SlimServer, is open-source, runs on Windows, Mac OS X, Linux, etc. and has an active community.  FLAC support is excellent; nearly the full <a href="format.html#subset">subset</a> (e.g. sample rates up to 48kHz, 16- and 24-bits per sample) including all standard encoding modes are supported.  Also supported are FLAC tags, automatic transcoding on the server of many audio formats to FLAC for transmission to the box, and external cuesheet support (internal cuesheet support is in the works).
 	</div>
 	<div class="box_footer"></div>
 </div>
 
 <br />
 
-<a name="music" />
 <div class="box">
 	<div class="box_title">
-		music
+		<a name="music">music</a>
 	</div>
 	<div class="box_header"></div>
 	<div class="box_body">
@@ -112,10 +141,14 @@
 		<br />
 		<b>Artists</b>
 		<ul>
+			<li><a href="http://www.bleep.com/?label=Autechre">Autechre</a></li>
 			<li><a href="http://www.bucketheadslivewedges.com/">Buckethead</a></li>
 			<li><a href="http://www.charliehunter.com/news/main.htm">Charlie Hunter</a></li>
 			<li><a href="http://www.c2b3live.com/">Colonel Claypool's Bucket of Bernie Brains</a></li>
 			<li><a href="http://stores.musictoday.com/store/dept.asp?band_id=1&amp;dept_id=2640">Dave Matthews Band</a></li>
+			<li><a href="http://stores.musictoday.com/store/dept.asp?band_id=171&amp;dept_id=6764">The Grateful Dead</a></li>
+			<li><a href="http://www.dgmlive.com/">King Crimson</a></li>
+			<li><a href="http://www.theymightbegiants.com/">They Might Be Giants</a></li>
 			<li><a href="http://www.livemetallica.com/">Metallica</a></li>
 			<li><a href="http://www.livephish.com/">Phish</a></li>
 			<li><a href="http://www.primuslive.com/">Primus</a></li>
@@ -124,14 +157,22 @@
 		<ul>
 			<li><a href="http://www.aliveaudio.net/">AliveAudio</a></li>
 			<li><a href="http://www.atorecords.com/">ATO Records</a> (<a href="http://stores.musictoday.com/store/dept.asp?dept_id=2654&amp;band_id=154">Store</a>)</li>
+			<li><a href="http://www.bleep.com/">Bleep.com</a></li>
+			<li><a href="http://www.burningshed.com/">Burning Shed</a></li>
 			<li><a href="http://digitalsoundboard.net/">DigitalSoundboard.net</a></li>
+			<li><a href="http://www.digital-tunes.net/">digital-tunes</a></li>
 			<li><a href="http://www.disclogic.com/">DiscLogic</a></li>
 			<li><a href="http://www.edmdigital.com/catalog/index.php?ref=13">EDM Digital</a></li>
+			<li><a href="http://www.experimedia.net/">Experimedia</a></li>
 			<li><a href="http://fastatmosphere.com/">Fast Atmosphere</a></li>
+			<li><a href="http://festivalink.net/">FestivaLink.net</a></li>
 			<li><a href="http://magnatune.com/">Magnatune</a></li>
 			<li><a href="http://www.mindawn.com/">Mindawn</a></li>
-			<li><a href="http://morganleahrecords.com">morgan leah records</a></li>
-			<li><a href="http://stores.musictoday.com">Musictoday</a></li>
+			<li><a href="http://morganleahrecords.com/">morgan leah records</a></li>
+			<li><a href="http://musicishere.com/">Music is Here!</a></li>
+			<li><a href="http://stores.musictoday.com/">Musictoday</a></li>
+			<li><a href="http://www.thephiladelphiaorchestra.com/">The Philadelphia Orchestra</a></li>
+			<li><a href="http://www.globalsound.si.edu/">Smithsonian Global Sound</a></li>
 			<li><a href="http://www.opsound.org/">Opsound</a></li>
 		</ul>
 		<b>Venues:</b>
@@ -150,6 +191,7 @@
 			<li><a href="http://www.dxdt.org/archive/">dxdt.org</a></li>
 			<li><a href="http://wiki.etree.org/">etree.org</a></li>
 			<li>The <a href="http://www.furthurnet.org/">Furthur Network</a></li>
+			<li><a href="http://nugs.net/">nugs.net</a>: live music downloads</li>
 		</ul>
 	</div>
 	<div class="box_footer"></div>
@@ -157,10 +199,9 @@
 
 <br />
 
-<a name="software" />
 <div class="box">
 	<div class="box_title">
-		software
+		<a name="software">software</a>
 	</div>
 	<div class="box_header"></div>
 	<div class="box_body">
@@ -171,9 +212,14 @@
 			<li><a href="http://easytag.sourceforge.net/">EasyTAG</a> versatile tagger</li>
 			<li><a href="http://entagged.sourceforge.net/">Entagged</a>, a Java audio file tagger</li>
 			<li><a href="http://etree-scripts.sourceforge.net/">etree-scripts</a>: command-line tools for verifying, tagging, converting, and burning lossless audio files</li>
-			<li><a href="http://www.uninformative.com/flacattack/">Flacattack</a>: an all-in-one tool that works with ExactAudioCopy to encode a CD image to FLAC, embed the cuesheet, add ReplayGain, create lossy files, etc. all in a customizable directory structure.</li>
-			<li><a href="http://home.wanadoo.nl/~w.speek/flac.htm">FLAC frontend</a> (Windows GUI)</li>
-			<li><a href="http://www.danrules.com/macflac/">MacFLAC</a> Mac OS X FLAC distribution</li>
+			<li><a href="http://members.home.nl/w.speek/flac.htm">FLAC frontend</a> (Windows GUI)</li>
+			<li><a href="http://www.linux1.ca/">Flac-Jacket</a>: a set of scripts for creating FLAC files and an HTML index</li>
+			<li><a href="http://www.gently.org.uk/flactag/">FLACTAG</a>: tags single album FLAC files with embedded CUE sheets using data from the MusicBrainz service</li>
+<!--
+			<li><a href="http://lufs.sourceforge.net/lufs/">LUFS</a>: a virtual file system that, via <a href="@@@">this plugin</a> can make FLAC files look like WAVE files and thus be used by any app that supports WAVE</li>
+-->
+			<li><!-- <a href="http://www.danrules.com/macflac/"><a href="http://www.versiontracker.com/dyn/moreinfo/macosx/15883"> --><a href="http://mac.softpedia.com/get/Audio/MacFLAC.shtml">MacFLAC</a> Mac OS X FLAC distribution</li>
+			<li><a href="http://mp3fs.sourceforge.net/">MP3FS</a>, a read-only FUSE filesystem which can transcode FLAC to MP3 on the fly</li>
 			<li><a href="http://rawrec.sourceforge.net/">rawrec/rawplay</a> recording/playback tools</li>
 			<li><a href="http://www.cyclooctane.com/sonice/">sonice</a> FLAC to Vorbis transcoder</li>
 			<li><a href="http://www.lameb.fsnet.co.uk/">Split_wav</a> WAV+CUE splitter</li>
@@ -193,12 +239,15 @@
 			<li><a href="http://alsaplayer.org/">AlsaPlayer</a></li>
 			<li><a href="http://aqualung.sourceforge.net/">Aqualung</a>, a Linux player</li>
 			<li><a href="http://bossogg.sourceforge.net/">Boss Ogg</a>: Audio client/server</li>
+			<li><a href="http://freshmeat.net/projects/cynthiune/">Cynthiune</a>: a music player for Mac OS X and GNUstep</li>
 			<li><a href="http://flac-tools.sourceforge.net/">flac-tools</a>: includes flac123 player</li>
-			<li><a href="http://www.giantdisc.com/">GiantDisc</a>: Linux jukebox + Palm remote</li>
+			<li><a href="http://www.giantdisc.org/">GiantDisc</a>: Linux jukebox + Palm remote</li>
 			<li><a href="http://jreceiver.sourceforge.net/">JReceiver</a> servlet-based audio server</li>
-			<li><a href="http://www.monsterfang.com/MCinFLAC/">Media Center FLAC plugin</a></li>
+			<li><a href="http://mcplugins.sourceforge.net/">Media Center FLAC plugins</a></li>
 			<li><a href="http://musicpd.sourceforge.net/">MPD</a>, Music Player Daemon</li>
 			<li><a href="http://www.mplayerhq.hu/">MPlayer</a></li>
+			<li><a href="http://www.freewebtown.com/mpxplay/">Mpxplay</a>, a DOS player</li>
+			<li><a href="http://muine.gooeylinux.org/">Muine</a>: a music player for GNOME</li>
 			<li><a href="http://musik.berlios.de/">Musik</a>: an open-source, cross-platform multimedia player and library</li>
 			<li><a href="http://www.mythtv.org/">MythTV</a>: Linux PVR and more</li>
 			<li><a href="http://ripperx.sourceforge.net/">ripperX</a>: X-based ripper/encoder</li>
@@ -212,24 +261,30 @@
 		<b>CD ripping/burning:</b>
 		<ul>
 			<li><a href="http://arson.sourceforge.net/">Arson</a>: KDE ripper/burner</li>
+			<li><a href="http://www.legroom.net/modules.php?op=modload&name=Open_Source&file=index&page=software&app=autoflac">AutoFLAC</a>: automated ripping and encoding to FLAC with EAC (ExactAudioCopy); also has a write mode for burning back to CD for an exact copy</li>
 			<li><a href="http://bach.dynet.com/crip/index.html">crip</a>: console ripper/encoder/tagger</li>
+			<li><a href="http://www.uninformative.com/flacattack/">Flacattack</a>: an all-in-one tool that works with EAC (ExactAudioCopy) to encode a CD image to FLAC, embed the cuesheet, add ReplayGain, create lossy files, etc. all in a customizable directory structure</li>
 			<li><a href="http://mareo.netfirms.com/">MAREO</a> multi-format encoder for EAC</li>
+			<li><a href="http://sbooth.org/Max/">Max</a>, a CD ripper and encoder for OS X</li>
 			<li><a href="http://rip.sourceforge.net/">rip</a> command-line ripper/encoder</li>
 			<li><a href="http://www.suwald.com/ripit/ripit.html">RipIT</a>, a console-based front-end to several ripping and encoding tools</li>
+			<li><a href="http://www.uninformative.com/wack/">Wack</a>, the successor to <a href="http://www.uninformative.com/flacattack/">Flacattack</a> which can encode to multiple formats at once</li>
 		</ul>
 		<b>Organizers:</b>
 		<ul>
+			<li><a href="http://www.ampache.org/">Ampache</a>, a PHP-based tool for managing, updating and playing files via a web interface</li>
 			<li><a href="http://www.blinkenlights.ch/cgi-bin/fm.pl?get=ipod">GNUpod</a> includes on-the-fly FLAC conversion to iPod</li>
 			<li><a href="http://mac.sourceforge.net/">MPEG Audio Collection</a></li>
 			<li><a href="http://www.rhythmbox.org/">Rhythmbox</a>, music management application for GNOME</li>
 		</ul>
-		<b>Developer tools and libraries:</b>
+		<b>Plugins, developer tools and libraries:</b>
 		<ul>
 			<li><a href="http://audiere.sourceforge.net/">audiere</a>, a high-level audio API</li>
 			<li><a href="http://search.cpan.org/~daniel/Audio-FLAC-0.8/FLAC.pm">Audio::FLAC</a> perl module</li>
 			<li><a href="http://search.cpan.org/author/DANIEL/Audio-FLAC-Decoder-0.2/Decoder.pm">Audio::FLAC::Decoder</a> perl module</li>
 			<li><a href="http://corecodec.org/projects/coreflac">CoreFLAC</a>: FLAC DirectShow filters</li>
 			<li><a href="http://www.illiminable.com/ogg/">DirectShow filters</a> for encoding to/decoding from FLAC and Ogg FLAC (as well as Ogg Vorbis/Speex/Theora).</li>
+			<li><a href="http://www.hydrogenaudio.org/forums/index.php?showtopic=41476&st=75&p=368174&#entry368174">FLACDotNet</a>, a .NET wrapper around libFLAC</li>
 			<li><a href="http://getid3.sourceforge.net/">getID3()</a>: a PHP4 script for extracting metadata</li>
 			<li><a href="http://www.gstreamer.net/">GStreamer</a> streaming media framework</li>
 			<li><a href="http://jflac.sourceforge.net/">jFLAC</a>: Java native FLAC decoder</li>
@@ -238,6 +293,8 @@
 			<li><a href="http://math.berkeley.edu/~roconnor/MMIOMP3/">MMIOFLAC</a>, Multimedia IOProc for OS/2</li>
 			<li><a href="http://ptarmigan.sourceforge.net/">Ptarmigan</a> media parser for XML</li>
 			<li><a href="http://www.icculus.org/SDL_sound/">SDL_sound</a> audio add-on to SDL</li>
+			<li><a href="http://wmptagext.sourceforge.net/">WMP Tag Support Extender</a> plugs in to Windows Media Player to allow access to FLAC tags</li>
+			<li><a href="http://www.xiph.org/quicktime/">XiphQT</a> component for Quicktime/iTunes that supports Ogg FLAC</li>
 		</ul>
 		<b>Scientific, Audio Analysis:</b>
 		<ul>
@@ -260,7 +317,23 @@
 
 
 <div class="copyright">
-	Copyright (c) 2004,2005,2006 Josh Coalson
+	<!-- @@@ oh so hacky -->
+	<table>
+		<tr>
+			<td align="left">
+				Copyright (c) 2004,2005,2006  Josh Coalson
+			</td>
+			<td width="1%" align="right">
+				<a href="http://sourceforge.net"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=13478&amp;type=1" width="88" height="31" border="0" alt="SourceForge.net Logo" /></a>
+			</td>
+			<td width="1%" align="right">
+				<a href="http://www.eff.org/cafe/"><img src="images/cafebug.gif" alt="CAFE Logo" border="0" /></a><br />
+			</td>
+			<td width="1%" align="right">
+				<a href="http://validator.w3.org/check?uri=referer"><img src="http://www.w3.org/Icons/valid-xhtml10" alt="Valid XHTML 1.0!" height="31" width="88" border="0" hspace="0" /></a>
+			</td>
+		</tr>
+	</table>
 </div>
 
 </body>
diff --git a/doc/html/news.html b/doc/html/news.html
index 869cfa1..0e8f346 100644
--- a/doc/html/news.html
+++ b/doc/html/news.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Copyright (c)  2000,2001,2002,2003,2004,2005,2006 Josh Coalson -->
+<!-- Copyright (c) 2000,2001,2002,2003,2004,2005,2006  Josh Coalson -->
 <!-- Permission is granted to copy, distribute and/or modify this document -->
 <!-- under the terms of the GNU Free Documentation License, Version 1.1 -->
 <!-- or any later version published by the Free Software Foundation; -->
@@ -53,6 +53,88 @@
 	</div>
 	<div class="box_header"></div>
 	<div class="box_body">
+
+		<a name="20061025">25-Oct-2006:</a>
+		<ul>
+			<li>
+				<b>Winamp 5.31 ships with FLAC support</b><br />
+				<br />
+				<a href="http://winamp.com/player/">Winamp 5.31</a> now includes Nullsoft FLAC plugins for encoding and decoding.  The decoder is based on our reference decoder plugin.  However the current encoder plugin is based on a pre-release of <a href="http://flake-enc.sourceforge.net/">flake</a> and we <a href="http://www.hydrogenaudio.org/forums/index.php?s=&showtopic=45013&view=findpost&p=443961">recommend to not use it for archival</a> yet.
+			</li>
+		</ul>
+
+		<a name="20051220">20-Dec-2005:</a>
+		<ul>
+			<li>
+				<b>Volvo's Digital Jukebox plays FLAC</b><br />
+				<br />
+				Want some FLAC with your Volvo?  Volvo's <a href="http://www.volvocars.com/DigitalJukebox/product_information/">Digital Jukebox</a>, developed with <a href="http://www.phatnoise.com/">PhatNoise</a>, is fully integrated with the car's audio system and available for the S60, V70, XC70, and S80.  PhatNoise's PhatBox in 2002 was the <a href="#20020213">first device</a> to support FLAC natively and has gained a loyal following.  The Digital Jukebox and PhatBox also support Ogg Vorbis.
+			</li>
+		</ul>
+
+		<a name="20050921">21-Sep-2005:</a>
+		<ul>
+			<li>
+				<b>Live2496 now records directly to FLAC</b><br />
+				<br />
+				<a href="http://www.gidluckmastering.com/live2496.html">Live2496</a>, a program that can record 24-bit audio up to 96kHz on a Pocket PC (using <a href="http://www.core-sound.com/">Core Sound's PDAudio interface</a>) now supports recording directly to FLAC.
+			</li>
+		</ul>
+
+		<a name="20050810">10-Aug-2005:</a>
+		<ul>
+			<li>
+				<b>Olive's new Symphony component supports FLAC</b><br />
+				<br />
+				The new <a href="http://www.olive.us/">Symphony</a> wireless digital music center by Olive <a href="http://www.theregister.com/2005/07/29/olive_symphony/">supports FLAC</a>.
+			</li>
+		</ul>
+
+		<a name="20050511">11-May-2005:</a>
+		<ul>
+			<li>
+				<b>YME supports FLAC and Vorbis</b><br />
+				<br />
+				<a href="http://music.yahoo.com/musicengine/">Yahoo! Music Engine</a> supports FLAC and Ogg Vorbis, for playback and ripping/encoding.
+			</li>
+		</ul>
+
+		<a name="20050510">10-May-2005:</a>
+		<ul>
+			<li>
+				<b>PONTIS' MS330 supports FLAC and Vorbis</b><br />
+				<br />
+				The new <a href="http://www.pontis.de/site_e/produkte/ms_330_e.htm">MS330 Media Server</a> from <a href="http://www.pontis.de/">PONTIS</a> supports FLAC and Ogg Vorbis.  In addition to playing from the internal hard disk, CD drive, and 6-in-1 flash card slot, it can also be connected to a network, and even a TV for graphical navigation, cover art, photo viewing, etc.
+			</li>
+		</ul>
+
+		<a name="20050502">02-May-2005:</a>
+		<ul>
+			<li>
+				<b>Sonos now supports FLAC and Vorbis</b><br />
+				<br />
+				The <a href="http://www.sonos.com/">Sonos Digital Music System</a> now <a href="http://www.sonos.com/news_and_reviews/press_releases/2005/pr_042605_rhap.htm">supports FLAC and Ogg Vorbis</a>.
+			</li>
+		</ul>
+
+		<a name="20050423">23-Apr-2005:</a>
+		<ul>
+			<li>
+				<b>iAUDIO X5 portable supports FLAC and Vorbis</b><br />
+				<br />
+				The new portable <a href="http://www.cowonamerica.com/products/iaudio/x5/">iAUDIO X5</a> from COWON supports FLAC and Ogg Vorbis.
+			</li>
+		</ul>
+
+		<a name="20050309">09-Mar-2005:</a>
+		<ul>
+			<li>
+				<b>Squeezebox2 supports FLAC on the box</b><br />
+				<br />
+				Slim Devices' new <a href="http://www.slimdevices.com/">Squeezebox2</a> supports FLAC decoding on the box, reducing the amount of precious wireless bandwidth required for FLAC playback.
+			</li>
+		</ul>
+
 		<a name="20050205">05-Feb-2005:</a>
 		<ul>
 			<li>
@@ -381,7 +463,7 @@
 		<a name="20020213">13-Feb-2002:</a>
 		<ul>
 			<li>
-				<b>FLAC goes hardware!</b>&nbsp;&nbsp;<a href="http://www.phatnoise.com/">Phatnoise</a> has become the first commercial hardware platform to support FLAC.  Firmware is now available for the Phatbox player to play FLAC files.  See <a href="http://www.phatnoise.com/technology/encoding.php">here</a> for details.
+				<b>FLAC goes hardware!</b>&nbsp;&nbsp;<a href="http://www.phatnoise.com/">PhatNoise</a> has become the first commercial hardware platform to support FLAC.  Firmware is now available for the Phatbox player to play FLAC files.  See <a href="http://www.phatnoise.com/technology/encoding.php">here</a> for details.
 			</li>
 		</ul>
 
@@ -554,7 +636,23 @@
 
 
 <div class="copyright">
-	Copyright (c) 2000,2001,2002,2003,2004,2005,2006 Josh Coalson
+	<!-- @@@ oh so hacky -->
+	<table>
+		<tr>
+			<td align="left">
+				Copyright (c) 2000,2001,2002,2003,2004,2005,2006  Josh Coalson
+			</td>
+			<td width="1%" align="right">
+				<a href="http://sourceforge.net"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=13478&amp;type=1" width="88" height="31" border="0" alt="SourceForge.net Logo" /></a>
+			</td>
+			<td width="1%" align="right">
+				<a href="http://www.eff.org/cafe/"><img src="images/cafebug.gif" alt="CAFE Logo" border="0" /></a><br />
+			</td>
+			<td width="1%" align="right">
+				<a href="http://validator.w3.org/check?uri=referer"><img src="http://www.w3.org/Icons/valid-xhtml10" alt="Valid XHTML 1.0!" height="31" width="88" border="0" hspace="0" /></a>
+			</td>
+		</tr>
+	</table>
 </div>
 
 </body>
diff --git a/doc/html/ogg_mapping.html b/doc/html/ogg_mapping.html
index 00e3b0e..97dac03 100644
--- a/doc/html/ogg_mapping.html
+++ b/doc/html/ogg_mapping.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Copyright (c)  2004,2005,2006 Josh Coalson -->
+<!-- Copyright (c) 2004,2005,2006  Josh Coalson -->
 <!-- Permission is granted to copy, distribute and/or modify this document -->
 <!-- under the terms of the GNU Free Documentation License, Version 1.1 -->
 <!-- or any later version published by the Free Software Foundation; -->
@@ -119,7 +119,23 @@
 
 
 <div class="copyright">
-	Copyright (c) 2004,2005,2006 Josh Coalson
+	<!-- @@@ oh so hacky -->
+	<table>
+		<tr>
+			<td align="left">
+				Copyright (c) 2004,2005,2006  Josh Coalson
+			</td>
+			<td width="1%" align="right">
+				<a href="http://sourceforge.net"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=13478&amp;type=1" width="88" height="31" border="0" alt="SourceForge.net Logo" /></a>
+			</td>
+			<td width="1%" align="right">
+				<a href="http://www.eff.org/cafe/"><img src="images/cafebug.gif" alt="CAFE Logo" border="0" /></a><br />
+			</td>
+			<td width="1%" align="right">
+				<a href="http://validator.w3.org/check?uri=referer"><img src="http://www.w3.org/Icons/valid-xhtml10" alt="Valid XHTML 1.0!" height="31" width="88" border="0" hspace="0" /></a>
+			</td>
+		</tr>
+	</table>
 </div>
 
 </body>
diff --git a/include/share/grabbag.h b/include/share/grabbag.h
index 5e477cb..1f55e48 100644
--- a/include/share/grabbag.h
+++ b/include/share/grabbag.h
@@ -1,19 +1,19 @@
 /* grabbag - Convenience lib for various routines common to several tools
  * Copyright (C) 2002,2003,2004,2005,2006 Josh Coalson
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #ifndef SHARE__GRABBAG_H
diff --git a/include/share/grabbag/cuesheet.h b/include/share/grabbag/cuesheet.h
index c925c35..41c8a66 100644
--- a/include/share/grabbag/cuesheet.h
+++ b/include/share/grabbag/cuesheet.h
@@ -1,19 +1,19 @@
 /* grabbag - Convenience lib for various routines common to several tools
  * Copyright (C) 2002,2003,2004,2005,2006 Josh Coalson
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 /* This .h cannot be included by itself; #include "share/grabbag.h" instead. */
diff --git a/include/share/grabbag/file.h b/include/share/grabbag/file.h
index 86260d9..0164e3d 100644
--- a/include/share/grabbag/file.h
+++ b/include/share/grabbag/file.h
@@ -1,19 +1,19 @@
 /* grabbag - Convenience lib for various routines common to several tools
  * Copyright (C) 2002,2003,2004,2005,2006 Josh Coalson
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 /* Convenience routines for manipulating files */
diff --git a/include/share/grabbag/replaygain.h b/include/share/grabbag/replaygain.h
index 1a053d7..d4d5898 100644
--- a/include/share/grabbag/replaygain.h
+++ b/include/share/grabbag/replaygain.h
@@ -1,19 +1,19 @@
 /* grabbag - Convenience lib for various routines common to several tools
  * Copyright (C) 2002,2003,2004,2005,2006 Josh Coalson
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 /*
diff --git a/include/share/grabbag/seektable.h b/include/share/grabbag/seektable.h
index 16c279c..58237f4 100644
--- a/include/share/grabbag/seektable.h
+++ b/include/share/grabbag/seektable.h
@@ -1,19 +1,19 @@
 /* grabbag - Convenience lib for various routines common to several tools
  * Copyright (C) 2002,2003,2004,2005,2006 Josh Coalson
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 /* Convenience routines for working with seek tables */
diff --git a/include/share/replaygain_synthesis.h b/include/share/replaygain_synthesis.h
index b019529..cd3685e 100644
--- a/include/share/replaygain_synthesis.h
+++ b/include/share/replaygain_synthesis.h
@@ -1,19 +1,19 @@
 /* replaygain_synthesis - Routines for applying ReplayGain to a signal
  * Copyright (C) 2002,2003,2004,2005,2006 Josh Coalson
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #ifndef FLAC__SHARE__REPLAYGAIN_SYNTHESIS_H
diff --git a/src/plugin_common/Makefile.am b/src/plugin_common/Makefile.am
index c1b8489..e6b2559 100644
--- a/src/plugin_common/Makefile.am
+++ b/src/plugin_common/Makefile.am
@@ -1,19 +1,19 @@
 #  plugin_common - Routines common to several plugins
 #  Copyright (C) 2002,2003,2004,2005,2006  Josh Coalson
 #
-#  This program is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU General Public License
-#  as published by the Free Software Foundation; either version 2
-#  of the License, or (at your option) any later version.
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License, or (at your option) any later version.
 #
-#  This program is distributed in the hope that it will be useful,
+#  This library is distributed in the hope that it will be useful,
 #  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
 #
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 AUTOMAKE_OPTIONS = foreign
 
@@ -26,7 +26,6 @@
 	charset.h \
 	defs.h \
 	dither.h \
-	locale_hack.h \
 	replaygain.h \
 	tags.h
 
diff --git a/src/plugin_common/Makefile.lite b/src/plugin_common/Makefile.lite
index 477f2d6..b723267 100644
--- a/src/plugin_common/Makefile.lite
+++ b/src/plugin_common/Makefile.lite
@@ -1,19 +1,19 @@
 #  plugin_common - Routines common to several plugins
 #  Copyright (C) 2002,2003,2004,2005,2006  Josh Coalson
 #
-#  This program is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU General Public License
-#  as published by the Free Software Foundation; either version 2
-#  of the License, or (at your option) any later version.
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License, or (at your option) any later version.
 #
-#  This program is distributed in the hope that it will be useful,
+#  This library is distributed in the hope that it will be useful,
 #  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
 #
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 #
 # GNU makefile
diff --git a/src/plugin_common/all.h b/src/plugin_common/all.h
index 48add02..d6f34b1 100644
--- a/src/plugin_common/all.h
+++ b/src/plugin_common/all.h
@@ -1,19 +1,19 @@
 /* plugin_common - Routines common to several plugins
  * Copyright (C) 2002,2003,2004,2005,2006  Josh Coalson
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #ifndef FLAC__PLUGIN_COMMON__ALL_H
@@ -21,7 +21,6 @@
 
 #include "charset.h"
 #include "dither.h"
-#include "locale_hack.h"
 #include "tags.h"
 
 #endif
diff --git a/src/plugin_common/defs.h b/src/plugin_common/defs.h
index 461bb79..d8409e3 100644
--- a/src/plugin_common/defs.h
+++ b/src/plugin_common/defs.h
@@ -1,19 +1,19 @@
 /* plugin_common - Routines common to several plugins
  * Copyright (C) 2002,2003,2004,2005,2006  Josh Coalson
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #ifndef FLAC__PLUGIN_COMMON__DEFS_H
diff --git a/src/plugin_common/dither.h b/src/plugin_common/dither.h
index ae98181..b1dc32b 100644
--- a/src/plugin_common/dither.h
+++ b/src/plugin_common/dither.h
@@ -1,19 +1,19 @@
 /* plugin_common - Routines common to several plugins
  * Copyright (C) 2002,2003,2004,2005,2006  Josh Coalson
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #ifndef FLAC__PLUGIN_COMMON__DITHER_H
diff --git a/src/plugin_common/plugin_common_static.dsp b/src/plugin_common/plugin_common_static.dsp
index f47d0f4..18d09cf 100644
--- a/src/plugin_common/plugin_common_static.dsp
+++ b/src/plugin_common/plugin_common_static.dsp
@@ -117,10 +117,6 @@
 # End Source File

 # Begin Source File

 

-SOURCE=.\locale_hack.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\replaygain.h

 # End Source File

 # Begin Source File

diff --git a/src/plugin_common/tags.c b/src/plugin_common/tags.c
index a8b283d..9036d4c 100644
--- a/src/plugin_common/tags.c
+++ b/src/plugin_common/tags.c
@@ -1,19 +1,19 @@
 /* plugin_common - Routines common to several plugins
  * Copyright (C) 2002,2003,2004,2005,2006  Josh Coalson
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #if HAVE_CONFIG_H
diff --git a/src/plugin_common/tags.h b/src/plugin_common/tags.h
index 60494a8..d6a07f4 100644
--- a/src/plugin_common/tags.h
+++ b/src/plugin_common/tags.h
@@ -1,19 +1,19 @@
 /* plugin_common - Routines common to several plugins
  * Copyright (C) 2002,2003,2004,2005,2006  Josh Coalson
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #ifndef FLAC__PLUGIN_COMMON__TAGS_H
diff --git a/src/plugin_winamp2/Makefile.am b/src/plugin_winamp2/Makefile.am
index 684e170..83de684 100644
--- a/src/plugin_winamp2/Makefile.am
+++ b/src/plugin_winamp2/Makefile.am
@@ -1,19 +1,19 @@
 #  in_flac - Winamp2 FLAC input plugin
 #  Copyright (C) 2000,2001,2002,2003,2004,2005,2006  Josh Coalson
 #
-#  This program is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU General Public License
-#  as published by the Free Software Foundation; either version 2
-#  of the License, or (at your option) any later version.
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License, or (at your option) any later version.
 #
-#  This program is distributed in the hope that it will be useful,
+#  This library is distributed in the hope that it will be useful,
 #  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
 #
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 SUBDIRS = include
 
diff --git a/src/plugin_winamp2/in_flac.c b/src/plugin_winamp2/in_flac.c
index bb61289..cd18cf3 100644
--- a/src/plugin_winamp2/in_flac.c
+++ b/src/plugin_winamp2/in_flac.c
@@ -1,19 +1,19 @@
 /* in_flac - Winamp2 FLAC input plugin

  * Copyright (C) 2000,2001,2002,2003,2004,2005,2006  Josh Coalson

  *

- * This program is free software; you can redistribute it and/or

- * modify it under the terms of the GNU General Public License

- * as published by the Free Software Foundation; either version 2

- * of the License, or (at your option) any later version.

+ * This library is free software; you can redistribute it and/or

+ * modify it under the terms of the GNU Lesser General Public

+ * License as published by the Free Software Foundation; either

+ * version 2.1 of the License, or (at your option) any later version.

  *

- * This program is distributed in the hope that it will be useful,

+ * This library is distributed in the hope that it will be useful,

  * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU General Public License for more details.

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

+ * Lesser General Public License for more details.

  *

- * You should have received a copy of the GNU General Public License

- * along with this program; if not, write to the Free Software

- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

+ * You should have received a copy of the GNU Lesser General Public

+ * License along with this library; if not, write to the Free Software

+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

  */

 

 #if HAVE_CONFIG_H

diff --git a/src/plugin_winamp2/include/Makefile.am b/src/plugin_winamp2/include/Makefile.am
index b31ce21..d9ae565 100644
--- a/src/plugin_winamp2/include/Makefile.am
+++ b/src/plugin_winamp2/include/Makefile.am
@@ -1,18 +1,18 @@
 #  in_flac - Winamp2 FLAC input plugin
 #  Copyright (C) 2000,2001,2002,2003,2004,2005,2006  Josh Coalson
 #
-#  This program is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU General Public License
-#  as published by the Free Software Foundation; either version 2
-#  of the License, or (at your option) any later version.
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License, or (at your option) any later version.
 #
-#  This program is distributed in the hope that it will be useful,
+#  This library is distributed in the hope that it will be useful,
 #  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
 #
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 SUBDIRS = winamp2
diff --git a/src/plugin_winamp2/include/winamp2/Makefile.am b/src/plugin_winamp2/include/winamp2/Makefile.am
index e76b685..db7518c 100644
--- a/src/plugin_winamp2/include/winamp2/Makefile.am
+++ b/src/plugin_winamp2/include/winamp2/Makefile.am
@@ -1,19 +1,19 @@
 #  in_flac - Winamp2 FLAC input plugin
 #  Copyright (C) 2000,2001,2002,2003,2004,2005,2006  Josh Coalson
 #
-#  This program is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU General Public License
-#  as published by the Free Software Foundation; either version 2
-#  of the License, or (at your option) any later version.
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License, or (at your option) any later version.
 #
-#  This program is distributed in the hope that it will be useful,
+#  This library is distributed in the hope that it will be useful,
 #  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
 #
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 EXTRA_DIST = \
 	in2.h \
diff --git a/src/plugin_winamp2/infobox.c b/src/plugin_winamp2/infobox.c
index 2f9bce1..1b1b684 100644
--- a/src/plugin_winamp2/infobox.c
+++ b/src/plugin_winamp2/infobox.c
@@ -1,19 +1,19 @@
 /* in_flac - Winamp2 FLAC input plugin

  * Copyright (C) 2002,2003,2004,2005,2006  Josh Coalson

  *

- * This program is free software; you can redistribute it and/or

- * modify it under the terms of the GNU General Public License

- * as published by the Free Software Foundation; either version 2

- * of the License, or (at your option) any later version.

+ * This library is free software; you can redistribute it and/or

+ * modify it under the terms of the GNU Lesser General Public

+ * License as published by the Free Software Foundation; either

+ * version 2.1 of the License, or (at your option) any later version.

  *

- * This program is distributed in the hope that it will be useful,

+ * This library is distributed in the hope that it will be useful,

  * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU General Public License for more details.

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

+ * Lesser General Public License for more details.

  *

- * You should have received a copy of the GNU General Public License

- * along with this program; if not, write to the Free Software

- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

+ * You should have received a copy of the GNU Lesser General Public

+ * License along with this library; if not, write to the Free Software

+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

  */

 

 #if HAVE_CONFIG_H

diff --git a/src/plugin_winamp2/infobox.h b/src/plugin_winamp2/infobox.h
index 49f6dac..7268b43 100644
--- a/src/plugin_winamp2/infobox.h
+++ b/src/plugin_winamp2/infobox.h
@@ -1,19 +1,19 @@
 /* in_flac - Winamp2 FLAC input plugin

  * Copyright (C) 2002,2003,2004,2005,2006  Josh Coalson

  *

- * This program is free software; you can redistribute it and/or

- * modify it under the terms of the GNU General Public License

- * as published by the Free Software Foundation; either version 2

- * of the License, or (at your option) any later version.

+ * This library is free software; you can redistribute it and/or

+ * modify it under the terms of the GNU Lesser General Public

+ * License as published by the Free Software Foundation; either

+ * version 2.1 of the License, or (at your option) any later version.

  *

- * This program is distributed in the hope that it will be useful,

+ * This library is distributed in the hope that it will be useful,

  * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU General Public License for more details.

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

+ * Lesser General Public License for more details.

  *

- * You should have received a copy of the GNU General Public License

- * along with this program; if not, write to the Free Software

- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

+ * You should have received a copy of the GNU Lesser General Public

+ * License along with this library; if not, write to the Free Software

+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

  */

 

 /*

diff --git a/src/plugin_winamp2/playback.c b/src/plugin_winamp2/playback.c
index c6a1e63..b3e2912 100644
--- a/src/plugin_winamp2/playback.c
+++ b/src/plugin_winamp2/playback.c
@@ -1,19 +1,19 @@
 /* in_flac - Winamp2 FLAC input plugin

  * Copyright (C) 2000,2001,2002,2003,2004,2005,2006  Josh Coalson

  *

- * This program is free software; you can redistribute it and/or

- * modify it under the terms of the GNU General Public License

- * as published by the Free Software Foundation; either version 2

- * of the License, or (at your option) any later version.

+ * This library is free software; you can redistribute it and/or

+ * modify it under the terms of the GNU Lesser General Public

+ * License as published by the Free Software Foundation; either

+ * version 2.1 of the License, or (at your option) any later version.

  *

- * This program is distributed in the hope that it will be useful,

+ * This library is distributed in the hope that it will be useful,

  * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU General Public License for more details.

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

+ * Lesser General Public License for more details.

  *

- * You should have received a copy of the GNU General Public License

- * along with this program; if not, write to the Free Software

- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

+ * You should have received a copy of the GNU Lesser General Public

+ * License along with this library; if not, write to the Free Software

+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

  */

 

 #if HAVE_CONFIG_H

diff --git a/src/plugin_winamp2/playback.h b/src/plugin_winamp2/playback.h
index 30f8093..040c896 100644
--- a/src/plugin_winamp2/playback.h
+++ b/src/plugin_winamp2/playback.h
@@ -1,19 +1,19 @@
 /* in_flac - Winamp2 FLAC input plugin

  * Copyright (C) 2000,2001,2002,2003,2004,2005,2006  Josh Coalson

  *

- * This program is free software; you can redistribute it and/or

- * modify it under the terms of the GNU General Public License

- * as published by the Free Software Foundation; either version 2

- * of the License, or (at your option) any later version.

+ * This library is free software; you can redistribute it and/or

+ * modify it under the terms of the GNU Lesser General Public

+ * License as published by the Free Software Foundation; either

+ * version 2.1 of the License, or (at your option) any later version.

  *

- * This program is distributed in the hope that it will be useful,

+ * This library is distributed in the hope that it will be useful,

  * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU General Public License for more details.

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

+ * Lesser General Public License for more details.

  *

- * You should have received a copy of the GNU General Public License

- * along with this program; if not, write to the Free Software

- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

+ * You should have received a copy of the GNU Lesser General Public

+ * License along with this library; if not, write to the Free Software

+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

  */

 

 #include "FLAC/all.h"

diff --git a/src/plugin_xmms/Makefile.am b/src/plugin_xmms/Makefile.am
index eaee4e6..6ea532c 100644
--- a/src/plugin_xmms/Makefile.am
+++ b/src/plugin_xmms/Makefile.am
@@ -26,6 +26,7 @@
 	charset.h \
 	configure.h \
 	http.h \
+	locale_hack.h \
 	plugin.h \
 	tag.h
 
diff --git a/src/plugin_xmms/charset.c b/src/plugin_xmms/charset.c
index ddbca98..c79e2ef 100644
--- a/src/plugin_xmms/charset.c
+++ b/src/plugin_xmms/charset.c
@@ -30,9 +30,9 @@
 #include <errno.h>
 
 #include "plugin_common/charset.h"
-#include "plugin_common/locale_hack.h"
 #include "charset.h"
 #include "configure.h"
+#include "locale_hack.h"
 
 
 /****************
diff --git a/src/plugin_xmms/configure.c b/src/plugin_xmms/configure.c
index 4fd3448..8adab10 100644
--- a/src/plugin_xmms/configure.c
+++ b/src/plugin_xmms/configure.c
@@ -38,10 +38,10 @@
 #include <xmms/util.h>
 #include <xmms/plugin.h>
 
-#include "plugin_common/locale_hack.h"
 #include "share/replaygain_synthesis.h" /* for NOISE_SHAPING_LOW */
 #include "charset.h"
 #include "configure.h"
+#include "locale_hack.h"
 
 /*
  * Initialize Global Valueable
diff --git a/src/plugin_xmms/fileinfo.c b/src/plugin_xmms/fileinfo.c
index ecb1e85..1d5f0ad 100644
--- a/src/plugin_xmms/fileinfo.c
+++ b/src/plugin_xmms/fileinfo.c
@@ -33,9 +33,9 @@
 #include "FLAC/metadata.h"
 #include "charset.h"
 #include "configure.h"
-#include "plugin_common/locale_hack.h"
 #include "plugin_common/replaygain.h"
 #include "plugin_common/tags.h"
+#include "locale_hack.h"
 
 static GtkWidget *window = NULL;
 static GList *genre_list = NULL;
diff --git a/src/plugin_xmms/http.c b/src/plugin_xmms/http.c
index a99c2c2..cf81bf1 100644
--- a/src/plugin_xmms/http.c
+++ b/src/plugin_xmms/http.c
@@ -40,9 +40,9 @@
 #include <xmms/util.h>
 #include <xmms/plugin.h>
 
-#include "configure.h"
-#include "plugin_common/locale_hack.h"
 #include "FLAC/format.h"
+#include "configure.h"
+#include "locale_hack.h"
 #include "plugin.h"
 
 /* on FreeBSD we get socklen_t from <sys/socket.h> */
diff --git a/src/plugin_common/locale_hack.h b/src/plugin_xmms/locale_hack.h
similarity index 96%
rename from src/plugin_common/locale_hack.h
rename to src/plugin_xmms/locale_hack.h
index 51f1373..d5097ef 100644
--- a/src/plugin_common/locale_hack.h
+++ b/src/plugin_xmms/locale_hack.h
@@ -1,5 +1,5 @@
 /* plugin_common - Routines common to several plugins
- * Copyright (C) 2002,2003,2004,2005,2006  Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005  Josh Coalson
  *
  * Based on:
  * locale.h - 2000/05/05 13:10 Jerome Couderc
diff --git a/src/share/grabbag/cuesheet.c b/src/share/grabbag/cuesheet.c
index 2f403db..2b2c7cd 100644
--- a/src/share/grabbag/cuesheet.c
+++ b/src/share/grabbag/cuesheet.c
@@ -1,19 +1,19 @@
 /* grabbag - Convenience lib for various routines common to several tools
  * Copyright (C) 2002,2003,2004,2005,2006  Josh Coalson
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #if HAVE_CONFIG_H
diff --git a/src/share/grabbag/file.c b/src/share/grabbag/file.c
index 5c1c780..dff861d 100644
--- a/src/share/grabbag/file.c
+++ b/src/share/grabbag/file.c
@@ -1,19 +1,19 @@
 /* grabbag - Convenience lib for various routines common to several tools
  * Copyright (C) 2002,2003,2004,2005,2006  Josh Coalson
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #if HAVE_CONFIG_H
diff --git a/src/share/grabbag/replaygain.c b/src/share/grabbag/replaygain.c
index f10f315..eafcaad 100644
--- a/src/share/grabbag/replaygain.c
+++ b/src/share/grabbag/replaygain.c
@@ -1,19 +1,19 @@
 /* grabbag - Convenience lib for various routines common to several tools
  * Copyright (C) 2002,2003,2004,2005,2006  Josh Coalson
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #if HAVE_CONFIG_H
diff --git a/src/share/grabbag/seektable.c b/src/share/grabbag/seektable.c
index cb41b33..3ee6374 100644
--- a/src/share/grabbag/seektable.c
+++ b/src/share/grabbag/seektable.c
@@ -1,19 +1,19 @@
 /* grabbag - Convenience lib for various routines common to several tools
  * Copyright (C) 2002,2003,2004,2005,2006  Josh Coalson
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #if HAVE_CONFIG_H
diff --git a/src/share/replaygain_synthesis/include/Makefile.am b/src/share/replaygain_synthesis/include/Makefile.am
index e524298..6586fbd 100644
--- a/src/share/replaygain_synthesis/include/Makefile.am
+++ b/src/share/replaygain_synthesis/include/Makefile.am
@@ -1,18 +1,18 @@
 #  replaygain_synthesis - Routines for applying ReplayGain to a signal
 #  Copyright (C) 2002,2003,2004,2005,2006  Josh Coalson
 # 
-#  This program is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU General Public License
-#  as published by the Free Software Foundation; either version 2
-#  of the License, or (at your option) any later version.
-# 
-#  This program is distributed in the hope that it will be useful,
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License, or (at your option) any later version.
+#
+#  This library is distributed in the hope that it will be useful,
 #  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-# 
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 SUBDIRS = private
diff --git a/src/share/replaygain_synthesis/include/private/Makefile.am b/src/share/replaygain_synthesis/include/private/Makefile.am
index df5279d..774fdd7 100644
--- a/src/share/replaygain_synthesis/include/private/Makefile.am
+++ b/src/share/replaygain_synthesis/include/private/Makefile.am
@@ -1,19 +1,19 @@
 #  replaygain_synthesis - Routines for applying ReplayGain to a signal
 #  Copyright (C) 2002,2003,2004,2005,2006  Josh Coalson
 # 
-#  This program is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU General Public License
-#  as published by the Free Software Foundation; either version 2
-#  of the License, or (at your option) any later version.
-# 
-#  This program is distributed in the hope that it will be useful,
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License, or (at your option) any later version.
+#
+#  This library is distributed in the hope that it will be useful,
 #  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-# 
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 noinst_HEADERS = \
 	fast_float_math_hack.h
diff --git a/src/share/replaygain_synthesis/replaygain_synthesis.c b/src/share/replaygain_synthesis/replaygain_synthesis.c
index 85c5aac..430a40b 100644
--- a/src/share/replaygain_synthesis/replaygain_synthesis.c
+++ b/src/share/replaygain_synthesis/replaygain_synthesis.c
@@ -1,19 +1,19 @@
 /* replaygain_synthesis - Routines for applying ReplayGain to a signal
  * Copyright (C) 2002,2003,2004,2005,2006  Josh Coalson
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 /*
  * This is an aggregation of pieces of code from John Edwards' WaveGain