diff --git a/chunk.h b/chunk.h
index 1a8ac170..cc9d197d 100644
--- a/chunk.h
+++ b/chunk.h
@@ -13,7 +13,6 @@
 
 #define FRAMES_PER_BUFFER  (PLAYER_CHUNK_SIZE/CHANNELS)
 
-int bufferMs;
 
 template <size_t T>
 struct ChunkT
diff --git a/client.cpp b/client.cpp
index cec1845c..cb22a15b 100644
--- a/client.cpp
+++ b/client.cpp
@@ -29,6 +29,7 @@ std::deque<int> timeDiffs;
 std::mutex mtx;
 std::mutex mutex;
 std::condition_variable cv;
+int bufferMs;
 
 
 void player() 
@@ -334,7 +335,7 @@ int main (int argc, char *argv[])
 		timeval now;
 		gettimeofday(&now, NULL);
 		std::cerr << "New chunk: " << chunkTime(*chunk) << "\t" << timeToStr(now) << "\t" << getAge(*chunk) << "\n";
-		for (size_t n=0; n<WIRE_CHUNK_MS/PLAYER_CHUNK_MS; ++n)
+/*		for (size_t n=0; n<WIRE_CHUNK_MS/PLAYER_CHUNK_MS; ++n)
 		{
 			PlayerChunk* playerChunk = new PlayerChunk();
 			playerChunk->tv_sec = chunk->tv_sec;
@@ -346,7 +347,7 @@ int main (int argc, char *argv[])
 			mutex.unlock();
 			cv.notify_all();
 		}
-    }
+*/    }
 	delete chunk;
     return 0;
 }
diff --git a/server.cpp b/server.cpp
index 8d2c4287..ea9c4c05 100644
--- a/server.cpp
+++ b/server.cpp
@@ -42,7 +42,7 @@ int main () {
     {
 		c[0] = cin.get();
 		c[1] = cin.get();
-        chunk.payload[idx++] = (int)c[0] + ((int)c[1] << 8);
+        chunk.payload[idx++] = (int)c[0] + ((int)c[1] * 256);
         if (idx == WIRE_CHUNK_SIZE)
         {
             timeval now;
@@ -63,7 +63,7 @@ int main () {
 //            snprintf ((char *) message.data(), size, "%05d %d", zipcode, c);
 //  	      message.data()[0] = c;
             publisher.send(message);
-            addMs(ts, WIRE_CHUNK_MS);
+///            addMs(ts, WIRE_CHUNK_MS);
             idx = 0;
 //            msg[0] = '0';
         }