diff --git a/server.cpp b/server.cpp
index b45f4a43..23830d80 100644
--- a/server.cpp
+++ b/server.cpp
@@ -33,9 +33,9 @@ int main () {
     timeval tvChunk;
     gettimeofday(&tvChunk, NULL);
 	long nextTick = getTickCount();
-    while (cin.good())
+    while (!cin.bad())
     {
-		for (size_t n=0; (n<WIRE_CHUNK_SIZE) && cin.good(); ++n)
+		for (size_t n=0; (n<WIRE_CHUNK_SIZE) && !cin.bad(); ++n)
 		{
 			c[0] = cin.get();
 			c[1] = cin.get();
@@ -48,8 +48,8 @@ int main () {
         zmq::message_t message(sizeof(Chunk));
         memcpy(message.data(), chunk, sizeof(Chunk));
         publisher.send(message);
-        addMs(tvChunk, WIRE_CHUNK_MS);
 
+        addMs(tvChunk, WIRE_CHUNK_MS);
 		nextTick += WIRE_CHUNK_MS;
 		long currentTick = getTickCount();
 		if (nextTick > currentTick)
diff --git a/stream.cpp b/stream.cpp
index 17f5cdec..43707a1c 100644
--- a/stream.cpp
+++ b/stream.cpp
@@ -149,10 +149,12 @@ void Stream::getChunk(short* outputBuffer, double outputBufferDacTime, unsigned
 		}
 		else
 		{
+			for (size_t i=0; i<chunks.size(); ++i)
+				std::cerr << "Chunk " << i << ": " << getAge(chunks[i]) - bufferMs << "\n";
 			for (int i=0; i<(int)(round((float)sleep / (float)PLAYER_CHUNK_MS)) + 1; ++i)
 			{
 //				std::cerr << "Sleep: " << sleep << "\n";
-				getNextPlayerChunk(outputBuffer);
+				std::cerr << getAge(getNextPlayerChunk(outputBuffer)) - bufferMs << "\t";
 				usleep(10);
 			}
 			sleep = 0;
@@ -206,8 +208,6 @@ void Stream::getChunk(short* outputBuffer, double outputBufferDacTime, unsigned
 		if (sleep != 0)
 		{
 			std::cerr << "Sleep: " << sleep << "\n";
-			for (size_t i=0; i<chunks.size(); ++i)
-				std::cerr << "Chunk " << i << ": " << getAge(chunks[i]) - bufferMs << "\n";
 		}
 //sleep = 0;
 		std::cerr << "Chunk: " << age << "\t" << shortMedian << "\t" << median << "\t" << pBuffer->size() << "\t" << outputBufferDacTime*1000 << "\n";