diff --git a/TODO b/TODO
index 4474e9655..cc9a091e7 100644
--- a/TODO
+++ b/TODO
@@ -12,14 +12,20 @@
 	*) Handle mp1 and mp2 files (including files with mp3 suffixes) 
 	*) add support for playing aac streams (gee, thanks icecast)
 	*) parsing of lame tags (including getting replaygain and gapless info)
+	*) read replaygain info from id3 tag
 
 *) aduio output
 	*) allowing "pausing" of audio output devices
 	*) while pausing, play silence for the devices that don't support 
 	   "pausing"
-	*) add support for automagically detecting the current output device
-	*) correlated the automagically deteted output device to the default
-	   mixer to choose
+	*) pick a default type depending on what we detect at compile time
+		*) don't attempt to autodetect, i think this will just cause
+			problems
+		*) output default audio device at the end of the configure
+			script
+	*) write a mac os X native audioOutput
+	*) write a esd native audioOutput
+	*) remove libao support!
 	*) need better resampling code
 
 0.13
diff --git a/doc/mpd.1 b/doc/mpd.1
index 667e3afed..5d120e139 100644
--- a/doc/mpd.1
+++ b/doc/mpd.1
@@ -73,10 +73,6 @@ This specifies the character set  used for the filesystem.  A list of supported
 character sets can be obtained by running "iconv -l".  The default is
 determined from the locale when the db was originally created.
 .TP
-.B id3v1_encoding <charset>
-This specifies the character set used for the ID3v1 tags. Supported characters
-sets also can be obtained from the iconv. By default ISO8859-1 is used.
-.TP
 .B bind_to_address <ip address or hostname or any>
 This specifies which address MPD binds to and listens on.  The default is "any",
 which binds to all available addresses.