diff --git a/examples/gameoflife.js b/examples/gameoflife.js
index 6779941dc7..d72a72c2de 100644
--- a/examples/gameoflife.js
+++ b/examples/gameoflife.js
@@ -115,7 +115,6 @@ function sendNextCells() {
 var sentFirstBoard = false;
 
 function step() {
-print("step()...");
   if (sentFirstBoard) {
     // we've already sent the first full board, perform a step in time
     updateCells();
diff --git a/libraries/shared/src/NodeList.cpp b/libraries/shared/src/NodeList.cpp
index 2672f3b27b..18b6e9883e 100644
--- a/libraries/shared/src/NodeList.cpp
+++ b/libraries/shared/src/NodeList.cpp
@@ -87,7 +87,7 @@ bool NodeList::packetVersionAndHashMatch(const QByteArray& packet) {
     if (packet[1] != versionForPacketType(packetTypeForPacket(packet))
         && packetTypeForPacket(packet) != PacketTypeStunResponse) {
         PacketType mismatchType = packetTypeForPacket(packet);
-        int numPacketTypeBytes = arithmeticCodingValueFromBuffer(packet.data());
+        int numPacketTypeBytes = numBytesArithmeticCodingFromBuffer(packet.data());
         
         qDebug() << "Packet version mismatch on" << packetTypeForPacket(packet) << "- Sender"
             << uuidFromPacketHeader(packet) << "sent" << qPrintable(QString::number(packet[numPacketTypeBytes])) << "but"
diff --git a/libraries/voxels/src/VoxelEditPacketSender.cpp b/libraries/voxels/src/VoxelEditPacketSender.cpp
index fea75abf23..a6d3668207 100644
--- a/libraries/voxels/src/VoxelEditPacketSender.cpp
+++ b/libraries/voxels/src/VoxelEditPacketSender.cpp
@@ -14,24 +14,13 @@
 #include <PacketHeaders.h>
 #include "VoxelEditPacketSender.h"
 
-//////////////////////////////////////////////////////////////////////////////////////////
-// Function:    createVoxelEditMessage()
-// Description: creates an "insert" or "remove" voxel message for a voxel code
-//              corresponding to the closest voxel which encloses a cube with
-//              lower corners at x,y,z, having side of length S.
-//              The input values x,y,z range 0.0 <= v < 1.0
-//              message should be either 'S' for SET or 'E' for ERASE
-//
-// IMPORTANT:   The buffer is returned to you a buffer which you MUST delete when you are
-//              done with it.
-//
-// HACK ATTACK: Well, what if this is larger than the MTU? That's the caller's problem, we
-//              just truncate the message
-//
-// Complaints:  Brad :)
 #define GUESS_OF_VOXELCODE_SIZE 10
 #define MAXIMUM_EDIT_VOXEL_MESSAGE_SIZE 1500
 #define SIZE_OF_COLOR_DATA sizeof(rgbColor)
+/// creates an "insert" or "remove" voxel message for a voxel code corresponding to the closest voxel which encloses a cube 
+/// with lower corners at x,y,z, having side of length S. The input values x,y,z range 0.0 <= v < 1.0 message should be either
+/// PacketTypeVoxelSet, PacketTypeVoxelSetDestructive, or PacketTypeVoxelErase. The buffer is returned to caller becomes
+/// responsibility of caller and MUST be deleted by caller.
 bool createVoxelEditMessage(PacketType command, short int sequence,
                             int voxelCount, VoxelDetail* voxelDetails, unsigned char*& bufferOut, int& sizeOut) {
     
@@ -144,9 +133,9 @@ void VoxelEditPacketSender::queueVoxelEditMessages(PacketType type, int numberOf
 
     for (int i = 0; i < numberOfDetails; i++) {
         // use MAX_PACKET_SIZE since it's static and guarenteed to be larger than _maxPacketSize
-        static unsigned char bufferOut[MAX_PACKET_SIZE]; 
+        unsigned char bufferOut[MAX_PACKET_SIZE]; 
         int sizeOut = 0;
-        
+
         if (encodeVoxelEditMessageDetails(type, 1, &details[i], &bufferOut[0], _maxPacketSize, sizeOut)) {
             queueOctreeEditMessage(type, bufferOut, sizeOut);
         }