diff --git a/animation-server/src/main.cpp b/animation-server/src/main.cpp
index 9b43378eb2..eb1e3546dd 100644
--- a/animation-server/src/main.cpp
+++ b/animation-server/src/main.cpp
@@ -651,27 +651,27 @@ int main(int argc, const char * argv[])
     // Handle Local Domain testing with the --local command line
     const char* NO_BILLBOARD = "--NoBillboard";
     ::includeBillboard = !cmdOptionExists(argc, argv, NO_BILLBOARD);
-    printf("includeBillboard=%s\n",debug::valueOf(::includeBillboard));
+    printf("includeBillboard=%s\n", debug::valueOf(::includeBillboard));
 
     const char* NO_BORDER_TRACER = "--NoBorderTracer";
     ::includeBorderTracer = !cmdOptionExists(argc, argv, NO_BORDER_TRACER);
-    printf("includeBorderTracer=%s\n",debug::valueOf(::includeBorderTracer));
+    printf("includeBorderTracer=%s\n", debug::valueOf(::includeBorderTracer));
 
     const char* NO_MOVING_BUG = "--NoMovingBug";
     ::includeMovingBug = !cmdOptionExists(argc, argv, NO_MOVING_BUG);
-    printf("includeMovingBug=%s\n",debug::valueOf(::includeMovingBug));
+    printf("includeMovingBug=%s\n", debug::valueOf(::includeMovingBug));
 
     const char* INCLUDE_BLINKING_VOXEL = "--includeBlinkingVoxel";
     ::includeBlinkingVoxel = cmdOptionExists(argc, argv, INCLUDE_BLINKING_VOXEL);
-    printf("includeBlinkingVoxel=%s\n",debug::valueOf(::includeBlinkingVoxel));
+    printf("includeBlinkingVoxel=%s\n", debug::valueOf(::includeBlinkingVoxel));
 
     const char* NO_DANCE_FLOOR = "--NoDanceFloor";
     ::includeDanceFloor = !cmdOptionExists(argc, argv, NO_DANCE_FLOOR);
-    printf("includeDanceFloor=%s\n",debug::valueOf(::includeDanceFloor));
+    printf("includeDanceFloor=%s\n", debug::valueOf(::includeDanceFloor));
 
     const char* BUILD_STREET = "--BuildStreet";
     ::buildStreet = cmdOptionExists(argc, argv, BUILD_STREET);
-    printf("buildStreet=%s\n",debug::valueOf(::buildStreet));
+    printf("buildStreet=%s\n", debug::valueOf(::buildStreet));
 
     // Handle Local Domain testing with the --local command line
     const char* showPPS = "--showPPS";
diff --git a/libraries/voxels/src/JurisdictionMap.cpp b/libraries/voxels/src/JurisdictionMap.cpp
index 3b05e2980a..94e589c801 100644
--- a/libraries/voxels/src/JurisdictionMap.cpp
+++ b/libraries/voxels/src/JurisdictionMap.cpp
@@ -235,7 +235,6 @@ int JurisdictionMap::packIntoMessage(unsigned char* destinationBuffer, int avail
 
     // add the root jurisdiction
     if (_rootOctalCode) {
-        // copy the 
         int bytes = bytesRequiredForCodeLength(numberOfThreeBitSectionsInCode(_rootOctalCode));
         memcpy(destinationBuffer, &bytes, sizeof(bytes));
         destinationBuffer += sizeof(bytes);
diff --git a/libraries/voxels/src/JurisdictionSender.cpp b/libraries/voxels/src/JurisdictionSender.cpp
index e699951527..df48c27c47 100644
--- a/libraries/voxels/src/JurisdictionSender.cpp
+++ b/libraries/voxels/src/JurisdictionSender.cpp
@@ -39,11 +39,7 @@ bool JurisdictionSender::process() {
     bool continueProcessing = isStillRunning();
 
     // call our ReceivedPacketProcessor base class process so we'll get any pending packets
-    if (continueProcessing) {
-        continueProcessing = ReceivedPacketProcessor::process();
-    }
-
-    if (continueProcessing) {
+    if (continueProcessing && (continueProcessing = ReceivedPacketProcessor::process())) {
         // add our packet to our own queue, then let the PacketSender class do the rest of the work.
         static unsigned char buffer[MAX_PACKET_SIZE];
         unsigned char* bufferOut = &buffer[0];
diff --git a/libraries/voxels/src/VoxelSceneStats.h b/libraries/voxels/src/VoxelSceneStats.h
index 2d7f7cd068..0883de45e1 100644
--- a/libraries/voxels/src/VoxelSceneStats.h
+++ b/libraries/voxels/src/VoxelSceneStats.h
@@ -119,10 +119,11 @@ public:
     };
     
     /// Returns details about items tracked by VoxelSceneStats
-    /// \param 
+    /// \param Item item The item from the stats you're interested in.
     ItemInfo& getItemInfo(Item item) { return _ITEMS[item]; };
 
     /// Returns a UI formatted value of an item tracked by VoxelSceneStats
+    /// \param Item item The item from the stats you're interested in.
     char* getItemValue(Item item);
     
     /// Returns OctCode for root node of the jurisdiction of this particular voxel server
diff --git a/voxel-server/src/main.cpp b/voxel-server/src/main.cpp
index 2579c54751..3446ebe9c1 100644
--- a/voxel-server/src/main.cpp
+++ b/voxel-server/src/main.cpp
@@ -510,9 +510,8 @@ int main(int argc, const char * argv[]) {
     NodeList* nodeList = NodeList::createInstance(NODE_TYPE_VOXEL_SERVER, listenPort);
     setvbuf(stdout, NULL, _IOLBF, 0);
 
-    const int numNodeTypes = 2; 
-    const NODE_TYPE nodeTypes[numNodeTypes] = { NODE_TYPE_AGENT, NODE_TYPE_ANIMATION_SERVER };
-    NodeList::getInstance()->setNodeTypesOfInterest(&nodeTypes[0], numNodeTypes);
+    const NODE_TYPE nodeTypes[] = { NODE_TYPE_AGENT, NODE_TYPE_ANIMATION_SERVER };
+    NodeList::getInstance()->setNodeTypesOfInterest(&nodeTypes[0], sizeof(nodeTypes));
     
     // Handle Local Domain testing with the --local command line
     const char* local = "--local";