diff --git a/TODO b/TODO
index 44562ec02..bd516ccd8 100644
--- a/TODO
+++ b/TODO
@@ -34,6 +34,8 @@
 
 *) only use libid3tag for id3v2 tags, use internal implementation for id3v1 tags
 
+*) add support for composer, performer metadata
+
 0.13
 ----
 
diff --git a/src/playerData.c b/src/playerData.c
index b851a99f9..281453548 100644
--- a/src/playerData.c
+++ b/src/playerData.c
@@ -31,7 +31,7 @@ int buffered_before_play;
 int buffered_chunks;
 
 #define DEFAULT_BUFFER_SIZE		2048
-#define DEFAULT_BUFFER_BEFORE_PLAY	25
+#define DEFAULT_BUFFER_BEFORE_PLAY	0
 
 PlayerData * playerData_pd;