diff --git a/TODO b/TODO
index 902ef9892..d6dca89a8 100644
--- a/TODO
+++ b/TODO
@@ -1,7 +1,6 @@
 0.12
 ----
 *) AudioOutput
-	*) intigrate np's oss shit
 	*) have "format" as a default config option for all audioOutputs
 	*) don't automatically close audioOutput devices on openDevice(),
 		instead, let the plugins determine if they should be closed
@@ -12,6 +11,8 @@
 
 *) Cleanup Config File Code
 
+*) Steal resampling code from ices (i think this code works only for 16-bit)
+
 *) Rewrite replaygain stuff:
 	*) Replay gain struct with album and track gain's and peak's
 	*) Pass these to replaygain function
@@ -38,7 +39,7 @@
 	*) command for displaying playlist contents
 	*) command for appending to playlist
 
-*) abstract out input buffering from inputStream_http to inputStream
+*) max http buffering configurable
 
 *) use getaddrinfo instead of gethostbyname (check libshout)