diff --git a/Sound/Node.m b/Sound/Node.m
index a9e7b2604..773a62208 100644
--- a/Sound/Node.m
+++ b/Sound/Node.m
@@ -43,9 +43,7 @@
 		if (availOutput == 0)
 		{
 			[writeLock unlock];
-			NSLog(@"WAITING %i", shouldContinue);
 			[semaphore wait];
-			NSLog(@"NOT WAITING: %i", shouldContinue);
 			[writeLock lock];
 		}
 		else
@@ -155,9 +153,9 @@
 
 - (void)resetBuffer
 {
-	[semaphore signal];
 	[readLock lock];
 	[writeLock lock];
+	[semaphore signal];
 
 	[buffer empty];
 	
diff --git a/TODO b/TODO
index 21a909d82..1c5e041d6 100644
--- a/TODO
+++ b/TODO
@@ -1,2 +1,5 @@
 Deep sort when dropping files into the playlist.
-Plugins and such.
\ No newline at end of file
+Plugins and such.
+
+FIX SHUFFLE
+FIX TOTAL PLAYLIST TIME
\ No newline at end of file