diff --git a/interface/src/Cloud.cpp b/interface/src/Cloud.cpp
index e612d042a9..5d68ecba75 100644
--- a/interface/src/Cloud.cpp
+++ b/interface/src/Cloud.cpp
@@ -46,7 +46,7 @@ Cloud::Cloud(int num,
 
 void Cloud::render() {
     
-    float particle_attenuation_quadratic[] =  { 0.0f, 0.0f, 2.0f };
+    float particleAttenuationQuadratic[] =  { 0.0f, 0.0f, 2.0f };
     
     glEnable( GL_TEXTURE_2D );
     glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
@@ -57,7 +57,7 @@ void Cloud::render() {
     glPointSize( maxSize );
 
     
-    glPointParameterfvARB( GL_POINT_DISTANCE_ATTENUATION_ARB, particle_attenuation_quadratic );
+    glPointParameterfvARB( GL_POINT_DISTANCE_ATTENUATION_ARB, particleAttenuationQuadratic );
     glPointParameterfARB( GL_POINT_SIZE_MAX_ARB, maxSize );
     glPointParameterfARB( GL_POINT_SIZE_MIN_ARB, 0.001f );
     
diff --git a/interface/src/Head.cpp b/interface/src/Head.cpp
old mode 100755
new mode 100644
diff --git a/interface/src/Util.cpp b/interface/src/Util.cpp
index 627af610fe..a5e5d9c316 100644
--- a/interface/src/Util.cpp
+++ b/interface/src/Util.cpp
@@ -46,9 +46,9 @@ void render_vector(glm::vec3 * vec)
     glVertex3f(vec->x, vec->y, vec->z);
     // Draw marker dots for magnitude    
     glEnd();
-    float particle_attenuation_quadratic[] =  { 0.0f, 0.0f, 2.0f }; // larger Z = smaller particles
+    float particleAttenuationQuadratic[] =  { 0.0f, 0.0f, 2.0f }; // larger Z = smaller particles
 
-    glPointParameterfvARB( GL_POINT_DISTANCE_ATTENUATION_ARB, particle_attenuation_quadratic );
+    glPointParameterfvARB( GL_POINT_DISTANCE_ATTENUATION_ARB, particleAttenuationQuadratic );
     
     glEnable(GL_POINT_SMOOTH);
     glPointSize(10.0);
diff --git a/interface/src/main.cpp b/interface/src/main.cpp
index ebfd2aa024..1b5c4abf70 100644
--- a/interface/src/main.cpp
+++ b/interface/src/main.cpp
@@ -108,7 +108,7 @@ int starsTiles = 20;
 double starsLod = 1.0;
 #endif
 
-bool showingVoxels = false;
+bool showingVoxels = true;
 
 glm::vec3 box(WORLD_SIZE,WORLD_SIZE,WORLD_SIZE);
 
@@ -120,7 +120,7 @@ ParticleSystem balls(0,
                      0.0                   //  Gravity
                      );
 
-Cloud cloud(0,                         //  Particles
+Cloud cloud(0,                             //  Particles
             box,                           //  Bounding Box
             false                          //  Wrap
             );
@@ -177,10 +177,8 @@ SerialInterface serialPort;
 int latency_display = 1;
 
 glm::vec3 gravity;
-int first_measurement = 1;
-//int samplecount = 0;
 
-//  Frame rate Measurement
+//  Frame Rate Measurement
 
 int frameCount = 0;                  
 float FPS = 120.f;
@@ -188,12 +186,6 @@ timeval timerStart, timerEnd;
 timeval lastTimeIdle;
 double elapsedTime;
 
-// Particles
-
-
-float particle_attenuation_quadratic[] =  { 0.0f, 0.0f, 2.0f }; // larger Z = smaller particles
-float pointer_attenuation_quadratic[] =  { 1.0f, 0.0f, 0.0f }; // for 2D view
-
 #ifdef MARKER_CAPTURE
 
     /***  Marker Capture ***/
@@ -253,14 +245,6 @@ void displayStats(void)
         drawtext(300, 30, 0.10f, 0, 1.0, 0, stats);
     }
     
-    //  Output the ping times to the various agents 
-//    std::stringstream pingTimes;
-//    pingTimes << "Agent Pings, msecs:";
-//    for (int i = 0; i < getAgentCount(); i++) {
-//        pingTimes << " " << getAgentAddress(i) << ": " << getAgentPing(i);
-//    }
-//    drawtext(10,50,0.10, 0, 1.0, 0, (char *)pingTimes.str().c_str());
-
     std::stringstream voxelStats;
     voxelStats << "Voxels Rendered: " << voxels.getVoxelsRendered();
     drawtext(10,70,0.10f, 0, 1.0, 0, (char *)voxelStats.str().c_str());
@@ -860,10 +844,6 @@ void display(void)
         if (audioScope.getState()) audioScope.render();
         #endif
 
-
-        //drawvec3(100, 100, 0.15, 0, 1.0, 0, myAvatar.getPos(), 0, 1, 0);
-        glPointParameterfvARB( GL_POINT_DISTANCE_ATTENUATION_ARB, pointer_attenuation_quadratic );
-
         if (displayHeadMouse && !displayHead && statsOn)
         {
             //  Display small target box at center or head mouse target that can also be used to measure LOD
diff --git a/interface/src/starfield/Controller.h b/interface/src/starfield/Controller.h
index b004e73037..edf9fd7ec7 100644
--- a/interface/src/starfield/Controller.h
+++ b/interface/src/starfield/Controller.h
@@ -99,8 +99,8 @@ namespace starfield {
             _valLodOveralloc(1.2),
             _valLodNalloc(0),
             _valLodNrender(0),
-            _valLodBrightness(0),
             _valLodAllocBrightness(0),
+            _valLodBrightness(0),
             _ptrRenderer(0l) {
         }
 
diff --git a/interface/src/starfield/Loader.h b/interface/src/starfield/Loader.h
index 83d63adc2c..67c8f53b66 100644
--- a/interface/src/starfield/Loader.h
+++ b/interface/src/starfield/Loader.h
@@ -50,7 +50,7 @@ namespace starfield {
 
                 return false;
             }
- fprintf(stderr, "Stars.cpp: read %d stars, rendering %d\n", 
+ fprintf(stderr, "Stars.cpp: read %d stars, rendering %ld\n", 
       _valRecordsRead, _ptrVertices->size());
 
             return true;
diff --git a/interface/src/starfield/data/InputVertex.h b/interface/src/starfield/data/InputVertex.h
index dac242ec51..dc6c5a23be 100644
--- a/interface/src/starfield/data/InputVertex.h
+++ b/interface/src/starfield/data/InputVertex.h
@@ -26,8 +26,8 @@ namespace starfield {
 
         InputVertex(float azimuth, float altitude, unsigned color) {
 
-            _valColor = color >> 16 & 0xffu | color & 0xff00u |
-                    color << 16 & 0xff0000u | 0xff000000u;
+            _valColor = (color >> 16 & 0xffu) | (color & 0xff00u) |
+                    (color << 16 & 0xff0000u) | 0xff000000u;
 
             azimuth = angleConvert<Degrees,Radians>(azimuth);
             altitude = angleConvert<Degrees,Radians>(altitude);