diff --git a/examples/editEntities.js b/examples/editEntities.js
index f25a873992..a9b5bfeb16 100644
--- a/examples/editEntities.js
+++ b/examples/editEntities.js
@@ -190,6 +190,7 @@ var toolBar = (function () {
                 cameraManager.enable();
                 entityListTool.setVisible(true);
                 gridTool.setVisible(true);
+                grid.setEnabled(true);
                 propertiesTool.setVisible(true);
                 Window.setFocus();
             }
diff --git a/examples/html/gridControls.html b/examples/html/gridControls.html
index 7e354c5bec..941a4b5c2a 100644
--- a/examples/html/gridControls.html
+++ b/examples/html/gridControls.html
@@ -30,8 +30,8 @@
                         elPosY.value = origin.y.toFixed(2);
                     }
 
-                    if (data.minorGridSpacing !== undefined) {
-                        elMinorSpacing.value = data.minorGridSpacing;
+                    if (data.minorGridWidth !== undefined) {
+                        elMinorSpacing.value = data.minorGridWidth;
                     }
 
                     if (data.majorGridEvery !== undefined) {
@@ -57,7 +57,7 @@
                         origin: {
                             y: elPosY.value,
                         },
-                        minorGridSpacing: elMinorSpacing.value,
+                        minorGridWidth: elMinorSpacing.value,
                         majorGridEvery: elMajorSpacing.value,
                         gridColor: gridColor,
                         colorIndex: gridColorIndex,
diff --git a/interface/src/ui/ApplicationOverlay.cpp b/interface/src/ui/ApplicationOverlay.cpp
index 18b9943e29..f9437221e5 100644
--- a/interface/src/ui/ApplicationOverlay.cpp
+++ b/interface/src/ui/ApplicationOverlay.cpp
@@ -788,13 +788,12 @@ void ApplicationOverlay::renderAudioMeter() {
 
     //  Audio VU Meter and Mute Icon
     const int MUTE_ICON_SIZE = 24;
-    const int AUDIO_METER_INSET = 2;
     const int MUTE_ICON_PADDING = 10;
-    const int AUDIO_METER_WIDTH = MIRROR_VIEW_WIDTH - MUTE_ICON_SIZE - AUDIO_METER_INSET - MUTE_ICON_PADDING;
-    const int AUDIO_METER_SCALE_WIDTH = AUDIO_METER_WIDTH - 2 * AUDIO_METER_INSET;
+    const int AUDIO_METER_WIDTH = MIRROR_VIEW_WIDTH - MUTE_ICON_SIZE  - MUTE_ICON_PADDING;
+    const int AUDIO_METER_SCALE_WIDTH = AUDIO_METER_WIDTH - 2 ;
     const int AUDIO_METER_HEIGHT = 8;
     const int AUDIO_METER_GAP = 5;
-    const int AUDIO_METER_X = MIRROR_VIEW_LEFT_PADDING + MUTE_ICON_SIZE + AUDIO_METER_INSET + AUDIO_METER_GAP;
+    const int AUDIO_METER_X = MIRROR_VIEW_LEFT_PADDING + MUTE_ICON_SIZE + AUDIO_METER_GAP;
 
     int audioMeterY;
     bool smallMirrorVisible = Menu::getInstance()->isOptionChecked(MenuOption::Mirror) && !OculusManager::isConnected();
@@ -847,7 +846,7 @@ void ApplicationOverlay::renderAudioMeter() {
 
     //  Draw audio meter background Quad
     DependencyManager::get<GeometryCache>()->renderQuad(AUDIO_METER_X, audioMeterY, AUDIO_METER_WIDTH, AUDIO_METER_HEIGHT, 
-                                                            glm::vec4(0, 0, 0, 1));
+                                                            glm::vec4(0.298f, 0.757f, 0.722f, 1));
 
     if (audioLevel > AUDIO_RED_START) {
         glm::vec4 quadColor;
@@ -857,10 +856,10 @@ void ApplicationOverlay::renderAudioMeter() {
             quadColor = glm::vec4(1, 1, 1, 1);
         }
         // Draw Red Quad
-        DependencyManager::get<GeometryCache>()->renderQuad(AUDIO_METER_X + AUDIO_METER_INSET + AUDIO_RED_START, 
-                                                            audioMeterY + AUDIO_METER_INSET, 
+        DependencyManager::get<GeometryCache>()->renderQuad(AUDIO_METER_X + AUDIO_RED_START, 
+                                                            audioMeterY, 
                                                             audioLevel - AUDIO_RED_START, 
-                                                            AUDIO_METER_HEIGHT - AUDIO_METER_INSET, quadColor,
+                                                            AUDIO_METER_HEIGHT, quadColor,
                                                             _audioRedQuad);
         
         audioLevel = AUDIO_RED_START;
@@ -874,26 +873,28 @@ void ApplicationOverlay::renderAudioMeter() {
             quadColor = glm::vec4(1, 1, 1, 1);
         }
         // Draw Green Quad
-        DependencyManager::get<GeometryCache>()->renderQuad(AUDIO_METER_X + AUDIO_METER_INSET + AUDIO_GREEN_START, 
-                                                            audioMeterY + AUDIO_METER_INSET, 
+        DependencyManager::get<GeometryCache>()->renderQuad(AUDIO_METER_X  + AUDIO_GREEN_START, 
+                                                            audioMeterY, 
                                                             audioLevel - AUDIO_GREEN_START, 
-                                                            AUDIO_METER_HEIGHT - AUDIO_METER_INSET, quadColor,
+                                                            AUDIO_METER_HEIGHT, quadColor,
                                                             _audioGreenQuad);
 
         audioLevel = AUDIO_GREEN_START;
     }
-    //   Draw Blue Quad
-    glm::vec4 quadColor;
-    if (!isClipping) {
-        quadColor = AUDIO_METER_BLUE;
-    } else {
-        quadColor = glm::vec4(1, 1, 1, 1);
+
+    if (audioLevel >= 0) {
+        glm::vec4 quadColor;
+        if (!isClipping) {
+            quadColor = AUDIO_METER_BLUE;
+        } else {
+            quadColor = glm::vec4(1, 1, 1, 1);
+        }
+        // Draw Blue (low level) quad
+        DependencyManager::get<GeometryCache>()->renderQuad(AUDIO_METER_X,
+                                                            audioMeterY,
+                                                            audioLevel, AUDIO_METER_HEIGHT, quadColor,
+                                                            _audioBlueQuad);
     }
-    // Draw Blue (low level) quad
-    DependencyManager::get<GeometryCache>()->renderQuad(AUDIO_METER_X + AUDIO_METER_INSET, 
-                                                        audioMeterY + AUDIO_METER_INSET, 
-                                                        audioLevel, AUDIO_METER_HEIGHT - AUDIO_METER_INSET, quadColor,
-                                                        _audioBlueQuad);
 }
 
 void ApplicationOverlay::renderStatsAndLogs() {
diff --git a/libraries/audio/src/AudioInjector.cpp b/libraries/audio/src/AudioInjector.cpp
index 1e66ad77cf..9981e0fba7 100644
--- a/libraries/audio/src/AudioInjector.cpp
+++ b/libraries/audio/src/AudioInjector.cpp
@@ -58,7 +58,7 @@ void AudioInjector::setIsFinished(bool isFinished) {
         
         if (_shouldDeleteAfterFinish) {
             // we've been asked to delete after finishing, trigger a queued deleteLater here
-            qDebug() << "triggering the delete since we are finished";
+            qDebug() << "AudioInjector triggering delete from setIsFinished";
             QMetaObject::invokeMethod(this, "deleteLater", Qt::QueuedConnection);
         }
     }