diff --git a/assignment-client/src/audio/AudioMixer.cpp b/assignment-client/src/audio/AudioMixer.cpp
index dd566bc40b..06e6f77f69 100644
--- a/assignment-client/src/audio/AudioMixer.cpp
+++ b/assignment-client/src/audio/AudioMixer.cpp
@@ -549,14 +549,18 @@ void AudioMixer::readPendingDatagram(const QByteArray& receivedPacket, const Hif
             
             nodeList->findNodeAndUpdateWithDataFromPacket(receivedPacket);
         } else if (mixerPacketType == PacketTypeMuteEnvironment) {
-            QByteArray packet = receivedPacket;
-            populatePacketHeader(packet, PacketTypeMuteEnvironment);
-            
-            nodeList->eachNode([&](const SharedNodePointer& node){
-                if (node->getType() == NodeType::Agent && node->getActiveSocket() && node->getLinkedData() && node != nodeList->sendingNodeForPacket(receivedPacket)) {
-                    nodeList->writeDatagram(packet, packet.size(), node);
-                }
-            });
+            SharedNodePointer sendingNode = nodeList->sendingNodeForPacket(receivedPacket);
+            if (sendingNode->getCanAdjustLocks()) {
+                QByteArray packet = receivedPacket;
+                populatePacketHeader(packet, PacketTypeMuteEnvironment);
+                
+                nodeList->eachNode([&](const SharedNodePointer& node){
+                    if (node->getType() == NodeType::Agent && node->getActiveSocket() &&
+                        node->getLinkedData() && node != sendingNode) {
+                        nodeList->writeDatagram(packet, packet.size(), node);
+                    }
+                });
+            }
         } else {
             // let processNodeData handle it.
             nodeList->processNodeData(senderSockAddr, receivedPacket);
diff --git a/examples/html/entityProperties.html b/examples/html/entityProperties.html
index 4ac1b70e33..dd5bced393 100644
--- a/examples/html/entityProperties.html
+++ b/examples/html/entityProperties.html
@@ -508,18 +508,22 @@
             // To make this work we block the first mouseup event after the elements
             // received focus.  If we block all mouseup events the user will not
             // be able to click within the selected text.
+            // We also check to see if the value has changed to make sure we aren't
+            // blocking a mouse-up event when clicking on an input spinner.
             var els = document.querySelectorAll("input, textarea");
             for (var i = 0; i < els.length; i++) {
                 var clicked = false;
+                var originalText;
                 els[i].onfocus = function() {
+                    originalText = this.value;
                     this.select();
                     clicked = false;
                 };
                 els[i].onmouseup = function(e) {
-                    if (!clicked) {
+                    if (!clicked && originalText == this.value) {
                         e.preventDefault();
-                        clicked = true;
                     }
+                    clicked = true;
                 };
             }
         }
diff --git a/examples/utilities/tools/developerMenuItems.js b/examples/utilities/tools/developerMenuItems.js
index a691031131..58b5149307 100644
--- a/examples/utilities/tools/developerMenuItems.js
+++ b/examples/utilities/tools/developerMenuItems.js
@@ -12,17 +12,27 @@
 //
 
 var createdRenderMenu = false;
+var createdGeneratedAudioMenu = false;
 
-var ENTITIES_MENU = "Developer > Entities";
+var DEVELOPER_MENU = "Developer";
+
+var ENTITIES_MENU = DEVELOPER_MENU + " > Entities";
 var COLLISION_UPDATES_TO_SERVER = "Don't send collision updates to server";
 
-var RENDER_MENU = "Developer > Render";
+var RENDER_MENU = DEVELOPER_MENU + " > Render";
 var ENTITIES_ITEM = "Entities";
 var AVATARS_ITEM = "Avatars";
 
+var AUDIO_MENU = DEVELOPER_MENU + " > Audio";
+var AUDIO_SOURCE_INJECT = "Generated Audio";
+var AUDIO_SOURCE_MENU = AUDIO_MENU + " > Generated Audio Source";
+var AUDIO_SOURCE_PINK_NOISE = "Pink Noise";
+var AUDIO_SOURCE_SINE_440 = "Sine 440hz";
+
+
 function setupMenus() {
-    if (!Menu.menuExists("Developer")) {
-        Menu.addMenu("Developer");
+    if (!Menu.menuExists(DEVELOPER_MENU)) {
+        Menu.addMenu(DEVELOPER_MENU);
     }
     if (!Menu.menuExists(ENTITIES_MENU)) {
         Menu.addMenu(ENTITIES_MENU);
@@ -54,6 +64,20 @@ function setupMenus() {
     if (!Menu.menuItemExists(RENDER_MENU, AVATARS_ITEM)) {
         Menu.addMenuItem({ menuName: RENDER_MENU, menuItemName: AVATARS_ITEM, isCheckable: true, isChecked: Scene.shouldRenderAvatars })
     }
+    
+    
+    if (!Menu.menuExists(AUDIO_MENU)) {
+        Menu.addMenu(AUDIO_MENU);
+    }
+    if (!Menu.menuItemExists(AUDIO_MENU, AUDIO_SOURCE_INJECT)) {
+        Menu.addMenuItem({ menuName: AUDIO_MENU, menuItemName: AUDIO_SOURCE_INJECT, isCheckable: true, isChecked: false });
+        Menu.addMenu(AUDIO_SOURCE_MENU);
+        Menu.addMenuItem({ menuName: AUDIO_SOURCE_MENU, menuItemName: AUDIO_SOURCE_PINK_NOISE, isCheckable: true, isChecked: false });
+        Menu.addMenuItem({ menuName: AUDIO_SOURCE_MENU, menuItemName: AUDIO_SOURCE_SINE_440, isCheckable: true, isChecked: false });
+        Menu.setIsOptionChecked(AUDIO_SOURCE_PINK_NOISE, true);
+        Audio.selectPinkNoise();
+        createdGeneratedAudioMenu = true;
+    }
 }
 
 Menu.menuItemEvent.connect(function (menuItem) {
@@ -67,7 +91,15 @@ Menu.menuItemEvent.connect(function (menuItem) {
         Scene.shouldRenderEntities = Menu.isOptionChecked(ENTITIES_ITEM);
     } else if (menuItem == AVATARS_ITEM) {
         Scene.shouldRenderAvatars = Menu.isOptionChecked(AVATARS_ITEM);
-    }
+    } else if (menuItem == AUDIO_SOURCE_INJECT && !createdGeneratedAudioMenu) {
+        Audio.injectGeneratedNoise(Menu.isOptionChecked(AUDIO_SOURCE_INJECT));
+   } else if (menuItem == AUDIO_SOURCE_PINK_NOISE && !createdGeneratedAudioMenu) {
+       Audio.selectPinkNoise();
+       Menu.setIsOptionChecked(AUDIO_SOURCE_SINE_440, false);
+   } else if (menuItem == AUDIO_SOURCE_SINE_440 && !createdGeneratedAudioMenu) {
+       Audio.selectSine440();
+       Menu.setIsOptionChecked(AUDIO_SOURCE_PINK_NOISE, false);
+   }
 });
 
 Scene.shouldRenderAvatarsChanged.connect(function(shouldRenderAvatars) {
@@ -87,6 +119,12 @@ function scriptEnding() {
         Menu.removeMenuItem(RENDER_MENU, ENTITIES_ITEM);
         Menu.removeMenuItem(RENDER_MENU, AVATARS_ITEM);
     }
+    
+    if (createdGeneratedAudioMenu) {
+        Audio.injectGeneratedNoise(false);
+        Menu.removeMenuItem(AUDIO_MENU, AUDIO_SOURCE_INJECT);
+        Menu.removeMenu(AUDIO_SOURCE_MENU);
+    }
 }
 
 setupMenus();
diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 0766d45ff3..0f75de9696 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -625,6 +625,10 @@ void Application::cleanupBeforeQuit() {
     
     // destroy the AudioClient so it and its thread have a chance to go down safely
     DependencyManager::destroy<AudioClient>();
+
+#ifdef HAVE_DDE
+    DependencyManager::destroy<DdeFaceTracker>();
+#endif
 }
 
 Application::~Application() {    
@@ -1831,8 +1835,10 @@ FaceTracker* Application::getActiveFaceTracker() {
 void Application::setActiveFaceTracker() {
 #ifdef HAVE_FACESHIFT
     DependencyManager::get<Faceshift>()->setTCPEnabled(Menu::getInstance()->isOptionChecked(MenuOption::Faceshift));
-#endif 
+#endif
+#ifdef HAVE_DDE
     DependencyManager::get<DdeFaceTracker>()->setEnabled(Menu::getInstance()->isOptionChecked(MenuOption::DDEFaceRegression));
+#endif
 #ifdef HAVE_VISAGE
     DependencyManager::get<Visage>()->updateEnabled();
 #endif
diff --git a/interface/src/Application.h b/interface/src/Application.h
index 57c6530ad4..e765c3b6b5 100644
--- a/interface/src/Application.h
+++ b/interface/src/Application.h
@@ -213,6 +213,8 @@ public:
     bool getLastMouseMoveWasSimulated() const { return _lastMouseMoveWasSimulated; }
     
     FaceTracker* getActiveFaceTracker();
+    void setActiveFaceTracker();
+
     QSystemTrayIcon* getTrayIcon() { return _trayIcon; }
     ApplicationOverlay& getApplicationOverlay() { return _applicationOverlay; }
     Overlays& getOverlays() { return _overlays; }
@@ -393,8 +395,6 @@ public slots:
 
     void notifyPacketVersionMismatch();
 
-    void setActiveFaceTracker();
-
     void domainConnectionDenied(const QString& reason);
 
 private slots:
diff --git a/interface/src/MainWindow.cpp b/interface/src/MainWindow.cpp
index 41b1249af1..f60716dc48 100644
--- a/interface/src/MainWindow.cpp
+++ b/interface/src/MainWindow.cpp
@@ -55,6 +55,10 @@ void MainWindow::saveGeometry() {
     }
 }
 
+void MainWindow::closeEvent(QCloseEvent* event) {
+    qApp->quit();
+}
+
 void MainWindow::moveEvent(QMoveEvent* event) {
     emit windowGeometryChanged(QRect(event->pos(), size()));
     QMainWindow::moveEvent(event);
diff --git a/interface/src/MainWindow.h b/interface/src/MainWindow.h
index 4437fa6a1f..c6faf8e01a 100644
--- a/interface/src/MainWindow.h
+++ b/interface/src/MainWindow.h
@@ -30,6 +30,7 @@ signals:
     void windowShown(bool shown);
 
 protected:
+    virtual void closeEvent(QCloseEvent* event);
     virtual void moveEvent(QMoveEvent* event);
     virtual void resizeEvent(QResizeEvent* event);
     virtual void showEvent(QShowEvent* event);
diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index 64e5accb1b..5d02cf9094 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -376,28 +376,36 @@ Menu::Menu() {
 
         QAction* noFaceTracker = addCheckableActionToQMenuAndActionHash(faceTrackingMenu, MenuOption::NoFaceTracking,
             0, true,
-            qApp, SLOT(setActiveFaceTracker()));
+            this, SLOT(setActiveFaceTracker()));
         faceTrackerGroup->addAction(noFaceTracker);
 
 #ifdef HAVE_FACESHIFT
         QAction* faceshiftFaceTracker = addCheckableActionToQMenuAndActionHash(faceTrackingMenu, MenuOption::Faceshift,
             0, false,
-            qApp, SLOT(setActiveFaceTracker()));
+            this, SLOT(setActiveFaceTracker()));
         faceTrackerGroup->addAction(faceshiftFaceTracker);
 #endif
-
+#ifdef HAVE_DDE
         QAction* ddeFaceTracker = addCheckableActionToQMenuAndActionHash(faceTrackingMenu, MenuOption::DDEFaceRegression, 
             0, false,
-            qApp, SLOT(setActiveFaceTracker()));
+            this, SLOT(setActiveFaceTracker()));
         faceTrackerGroup->addAction(ddeFaceTracker);
-
+#endif
 #ifdef HAVE_VISAGE
         QAction* visageFaceTracker = addCheckableActionToQMenuAndActionHash(faceTrackingMenu, MenuOption::Visage, 
             0, false,
-            qApp, SLOT(setActiveFaceTracker()));
+            this, SLOT(setActiveFaceTracker()));
         faceTrackerGroup->addAction(visageFaceTracker);
 #endif
     }
+#ifdef HAVE_DDE
+    faceTrackingMenu->addSeparator();
+    QAction* ddeFaceTrackerReset = addActionToQMenuAndActionHash(faceTrackingMenu, MenuOption::ResetDDETracking, 
+        Qt::CTRL | Qt::Key_Apostrophe,
+        DependencyManager::get<DdeFaceTracker>().data(), SLOT(resetTracking()));
+    ddeFaceTrackerReset->setVisible(false);
+    faceTrackingMenu->addAction(ddeFaceTrackerReset);
+#endif
 
     addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::RenderSkeletonCollisionShapes);
     addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::RenderHeadCollisionShapes);
@@ -497,30 +505,6 @@ Menu::Menu() {
                                   0,
                                   audioIO.data(),
                                   SLOT(sendMuteEnvironmentPacket()));
-
-    addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::AudioSourceInject,
-                                           0,
-                                           false,
-                                           audioIO.data(),
-                                           SLOT(toggleAudioSourceInject()));
-    QMenu* audioSourceMenu = audioDebugMenu->addMenu("Generated Audio Source"); 
-    {
-        QAction *pinkNoise = addCheckableActionToQMenuAndActionHash(audioSourceMenu, MenuOption::AudioSourcePinkNoise,
-                                                               0,
-                                                               false,
-                                                               audioIO.data(),
-                                                               SLOT(selectAudioSourcePinkNoise()));
-        
-        QAction *sine440 = addCheckableActionToQMenuAndActionHash(audioSourceMenu, MenuOption::AudioSourceSine440,
-                                                                    0,
-                                                                    true,
-                                                                    audioIO.data(),
-                                                                    SLOT(selectAudioSourceSine440()));
-
-        QActionGroup* audioSourceGroup = new QActionGroup(audioSourceMenu);
-        audioSourceGroup->addAction(pinkNoise);
-        audioSourceGroup->addAction(sine440);
-    }
     
     auto scope = DependencyManager::get<AudioScope>();
 
@@ -1017,3 +1001,11 @@ void Menu::visibilityChanged(Discoverability::Mode discoverabilityMode) {
         qCDebug(interfaceapp) << "ERROR Menu::visibilityChanged() called with unrecognized value.";
     }
 }
+
+void Menu::setActiveFaceTracker() {
+#ifdef HAVE_DDE
+    bool isUsingDDE = Menu::getInstance()->isOptionChecked(MenuOption::DDEFaceRegression);
+    Menu::getInstance()->getActionForOption(MenuOption::ResetDDETracking)->setVisible(isUsingDDE);
+#endif
+    qApp->setActiveFaceTracker();
+}
diff --git a/interface/src/Menu.h b/interface/src/Menu.h
index db126a3c9b..f580b9204b 100644
--- a/interface/src/Menu.h
+++ b/interface/src/Menu.h
@@ -68,6 +68,7 @@ public slots:
     
 private slots:
     void setVisibility();
+    void setActiveFaceTracker();
 
 private:
     static Menu* _instance;
@@ -123,9 +124,6 @@ namespace MenuOption {
     const QString AudioScopeTwentyFrames = "Twenty";
     const QString AudioStats = "Audio Stats";
     const QString AudioStatsShowInjectedStreams = "Audio Stats Show Injected Streams";
-    const QString AudioSourceInject = "Generated Audio";
-    const QString AudioSourcePinkNoise = "Pink Noise";
-    const QString AudioSourceSine440 = "Sine 440hz";
     const QString BandwidthDetails = "Bandwidth Details";
     const QString BlueSpeechSphere = "Blue Sphere While Speaking";
     const QString BookmarkLocation = "Bookmark Location";
@@ -230,6 +228,7 @@ namespace MenuOption {
     const QString RenderAmbientLight8 = "CAMPUS_SUNSET";
     const QString RenderAmbientLight9 = "FUNSTON_BEACH_SUNSET";
     const QString ResetAvatarSize = "Reset Avatar Size";
+    const QString ResetDDETracking = "Reset DDE Tracking";
     const QString ResetSensors = "Reset Sensors";
     const QString RunningScripts = "Running Scripts";
     const QString RunTimingTests = "Run Timing Tests";
diff --git a/interface/src/devices/DdeFaceTracker.cpp b/interface/src/devices/DdeFaceTracker.cpp
index 751739ed24..a701160198 100644
--- a/interface/src/devices/DdeFaceTracker.cpp
+++ b/interface/src/devices/DdeFaceTracker.cpp
@@ -11,6 +11,7 @@
 
 #include <SharedUtil.h>
 
+#include <QCoreApplication>
 #include <QJsonDocument>
 #include <QJsonArray>
 #include <QJsonObject>
@@ -19,10 +20,21 @@
 #include "DdeFaceTracker.h"
 #include "FaceshiftConstants.h"
 #include "InterfaceLogging.h"
+#include "Menu.h"
 
 
-static const QHostAddress DDE_FEATURE_POINT_SERVER_ADDR("127.0.0.1");
-static const quint16 DDE_FEATURE_POINT_SERVER_PORT = 5555;
+static const QHostAddress DDE_SERVER_ADDR("127.0.0.1");
+static const quint16 DDE_SERVER_PORT = 64204;
+static const quint16 DDE_CONTROL_PORT = 64205;
+#if defined(Q_OS_WIN)
+static const QString DDE_PROGRAM_PATH = QCoreApplication::applicationDirPath() + "/dde/dde.exe";
+#elif defined(Q_OS_MAC)
+static const QString DDE_PROGRAM_PATH = QCoreApplication::applicationDirPath() + "/dde.app/Contents/MacOS/dde";
+#endif
+static const QStringList DDE_ARGUMENTS = QStringList() 
+    << "--udp=" + DDE_SERVER_ADDR.toString() + ":" + QString::number(DDE_SERVER_PORT) 
+    << "--receiver=" + QString::number(DDE_CONTROL_PORT)
+    << "--headless";
 
 static const int NUM_EXPRESSIONS = 46;
 static const int MIN_PACKET_SIZE = (8 + NUM_EXPRESSIONS) * sizeof(float) + sizeof(int);
@@ -121,14 +133,16 @@ struct Packet {
 };
 
 DdeFaceTracker::DdeFaceTracker() :
-    DdeFaceTracker(QHostAddress::Any, DDE_FEATURE_POINT_SERVER_PORT)
+    DdeFaceTracker(QHostAddress::Any, DDE_SERVER_PORT, DDE_CONTROL_PORT)
 {
 
 }
 
-DdeFaceTracker::DdeFaceTracker(const QHostAddress& host, quint16 port) :
+DdeFaceTracker::DdeFaceTracker(const QHostAddress& host, quint16 serverPort, quint16 controlPort) :
+    _ddeProcess(NULL),
     _host(host),
-    _port(port),
+    _serverPort(serverPort),
+    _controlPort(controlPort),
     _lastReceiveTimestamp(0),
     _reset(false),
     _leftBlinkIndex(0), // see http://support.faceshift.com/support/articles/35129-export-of-blendshapes
@@ -157,17 +171,50 @@ DdeFaceTracker::DdeFaceTracker(const QHostAddress& host, quint16 port) :
 }
 
 DdeFaceTracker::~DdeFaceTracker() {
-    if (_udpSocket.isOpen()) {
-        _udpSocket.close();
-    }
+    setEnabled(false);
 }
 
 void DdeFaceTracker::setEnabled(bool enabled) {
+#ifdef HAVE_DDE
     // isOpen() does not work as one might expect on QUdpSocket; don't test isOpen() before closing socket.
     _udpSocket.close();
     if (enabled) {
-        _udpSocket.bind(_host, _port);
+        _udpSocket.bind(_host, _serverPort);
     }
+
+    if (enabled && !_ddeProcess) {
+        // Terminate any existing DDE process, perhaps left running after an Interface crash
+        const char* DDE_EXIT_COMMAND = "exit";
+        _udpSocket.writeDatagram(DDE_EXIT_COMMAND, DDE_SERVER_ADDR, _controlPort);
+
+        qDebug() << "[Info] DDE Face Tracker Starting";
+        _ddeProcess = new QProcess(qApp);
+        connect(_ddeProcess, SIGNAL(finished(int, QProcess::ExitStatus)), SLOT(processFinished(int, QProcess::ExitStatus)));
+        _ddeProcess->start(QCoreApplication::applicationDirPath() + DDE_PROGRAM_PATH, DDE_ARGUMENTS);
+    }
+
+    if (!enabled && _ddeProcess) {
+        _ddeProcess->kill();  // More robust than trying to send an "exit" command to DDE
+        _ddeProcess = NULL;
+        qDebug() << "[Info] DDE Face Tracker Stopped";
+    }
+#endif
+}
+
+void DdeFaceTracker::processFinished(int exitCode, QProcess::ExitStatus exitStatus) {
+    if (_ddeProcess) {
+        // DDE crashed or was manually terminated
+        qDebug() << "[Info] DDE Face Tracker Stopped Unexpectedly";
+        _udpSocket.close();
+        _ddeProcess = NULL;
+        Menu::getInstance()->setIsOptionChecked(MenuOption::NoFaceTracking, true);
+    }
+}
+
+void DdeFaceTracker::resetTracking() {
+    qDebug() << "[Info] Reset DDE Tracking";
+    const char* DDE_RESET_COMMAND = "reset";
+    _udpSocket.writeDatagram(DDE_RESET_COMMAND, DDE_SERVER_ADDR, _controlPort);
 }
 
 bool DdeFaceTracker::isActive() const {
@@ -239,7 +286,7 @@ void DdeFaceTracker::decodePacket(const QByteArray& buffer) {
         }
 
         // Compute relative translation
-        float LEAN_DAMPING_FACTOR = 200.0f;
+        float LEAN_DAMPING_FACTOR = 75.0f;
         translation -= _referenceTranslation;
         translation /= LEAN_DAMPING_FACTOR;
         translation.x *= -1;
diff --git a/interface/src/devices/DdeFaceTracker.h b/interface/src/devices/DdeFaceTracker.h
index 3c95666a6c..490020e511 100644
--- a/interface/src/devices/DdeFaceTracker.h
+++ b/interface/src/devices/DdeFaceTracker.h
@@ -12,6 +12,11 @@
 #ifndef hifi_DdeFaceTracker_h
 #define hifi_DdeFaceTracker_h
 
+#if defined(Q_OS_WIN) || defined(Q_OS_OSX)
+    #define HAVE_DDE
+#endif
+
+#include <QProcess>
 #include <QUdpSocket>
 
 #include <DependencyManager.h>
@@ -45,9 +50,11 @@ public:
 
 public slots:
     void setEnabled(bool enabled);
+    void resetTracking();
 
 private slots:
-    
+    void processFinished(int exitCode, QProcess::ExitStatus exitStatus);
+
     //sockets
     void socketErrorOccurred(QAbstractSocket::SocketError socketError);
     void readPendingDatagrams();
@@ -55,11 +62,14 @@ private slots:
     
 private:
     DdeFaceTracker();
-    DdeFaceTracker(const QHostAddress& host, quint16 port);
+    DdeFaceTracker(const QHostAddress& host, quint16 serverPort, quint16 controlPort);
     ~DdeFaceTracker();
 
+    QProcess* _ddeProcess;
+
     QHostAddress _host;
-    quint16 _port;
+    quint16 _serverPort;
+    quint16 _controlPort;
     
     float getBlendshapeCoefficient(int index) const;
     void decodePacket(const QByteArray& buffer);
diff --git a/libraries/audio-client/src/AudioClient.cpp b/libraries/audio-client/src/AudioClient.cpp
index a02dc912f7..331e62ec70 100644
--- a/libraries/audio-client/src/AudioClient.cpp
+++ b/libraries/audio-client/src/AudioClient.cpp
@@ -493,7 +493,7 @@ void AudioClient::start() {
     _sourceGain.initialize();
     _noiseSource.initialize();
     _toneSource.initialize();
-    _sourceGain.setParameters(0.25f, 0.0f);
+    _sourceGain.setParameters(0.05f, 0.0f);
     _inputGain.setParameters(1.0f, 0.0f);
 }
 
@@ -726,9 +726,9 @@ void AudioClient::handleAudioInput() {
     int inputSamplesRequired = (int)((float)AudioConstants::NETWORK_FRAME_SAMPLES_PER_CHANNEL * inputToNetworkInputRatio);
 
     QByteArray inputByteArray = _inputDevice->readAll();
-
+    
+    //  Add audio source injection if enabled
     if (!_muted && _audioSourceInjectEnabled) {
-        
         int16_t* inputFrameData = (int16_t*)inputByteArray.data();
         const uint32_t inputFrameCount = inputByteArray.size() / sizeof(int16_t);
 
@@ -737,17 +737,12 @@ void AudioClient::handleAudioInput() {
 #if ENABLE_INPUT_GAIN
         _inputGain.render(_inputFrameBuffer);  // input/mic gain+mute
 #endif
-        //  Add audio source injection if enabled
-        if (_audioSourceInjectEnabled) {
-         
-            if (_toneSourceEnabled) {  // sine generator
-                _toneSource.render(_inputFrameBuffer);
-            }
-            else if(_noiseSourceEnabled) { // pink noise generator
-                _noiseSource.render(_inputFrameBuffer);
-            }
-            _sourceGain.render(_inputFrameBuffer); // post gain
+        if (_toneSourceEnabled) {  // sine generator
+            _toneSource.render(_inputFrameBuffer);
+        } else if(_noiseSourceEnabled) { // pink noise generator
+            _noiseSource.render(_inputFrameBuffer);
         }
+        _sourceGain.render(_inputFrameBuffer); // post gain
         _inputFrameBuffer.copyFrames(1, inputFrameCount, inputFrameData, true /*copy out*/);
     }
     
@@ -972,8 +967,8 @@ void AudioClient::setIsStereoInput(bool isStereoInput) {
     }
 }
 
-void AudioClient::toggleAudioSourceInject() {
-    _audioSourceInjectEnabled = !_audioSourceInjectEnabled;
+void AudioClient::enableAudioSourceInject(bool enable) {
+    _audioSourceInjectEnabled = enable;
 }
 
 void AudioClient::selectAudioSourcePinkNoise() {
diff --git a/libraries/audio-client/src/AudioClient.h b/libraries/audio-client/src/AudioClient.h
index 7ac445a7fc..bb145a209f 100644
--- a/libraries/audio-client/src/AudioClient.h
+++ b/libraries/audio-client/src/AudioClient.h
@@ -1,6 +1,6 @@
 //
 //  AudioClient.h
-//  interface/src
+//  libraries/audio-client/src
 //
 //  Created by Stephen Birarda on 1/22/13.
 //  Copyright 2013 High Fidelity, Inc.
@@ -143,9 +143,9 @@ public slots:
     void audioMixerKilled();
     void toggleMute();
     
-    void toggleAudioSourceInject();
-    void selectAudioSourcePinkNoise();
-    void selectAudioSourceSine440();
+    virtual void enableAudioSourceInject(bool enable);
+    virtual void selectAudioSourcePinkNoise();
+    virtual void selectAudioSourceSine440();
     
     void toggleAudioNoiseReduction() { _isNoiseGateEnabled = !_isNoiseGateEnabled; }
     
diff --git a/libraries/audio/src/AbstractAudioInterface.h b/libraries/audio/src/AbstractAudioInterface.h
index 656d3c1f58..9649d11ad2 100644
--- a/libraries/audio/src/AbstractAudioInterface.h
+++ b/libraries/audio/src/AbstractAudioInterface.h
@@ -27,6 +27,10 @@ public:
     
 public slots:
     virtual bool outputLocalInjector(bool isStereo, qreal volume, AudioInjector* injector) = 0;
+    
+    virtual void enableAudioSourceInject(bool enable) = 0;
+    virtual void selectAudioSourcePinkNoise() = 0;
+    virtual void selectAudioSourceSine440() = 0;
 };
 
 Q_DECLARE_METATYPE(AbstractAudioInterface*)
diff --git a/libraries/physics/src/DynamicCharacterController.cpp b/libraries/physics/src/DynamicCharacterController.cpp
index db84bea540..aaabe21e9b 100644
--- a/libraries/physics/src/DynamicCharacterController.cpp
+++ b/libraries/physics/src/DynamicCharacterController.cpp
@@ -245,7 +245,6 @@ void DynamicCharacterController::setEnabled(bool enabled) {
             // Don't bother clearing REMOVE bit since it might be paired with an UPDATE_SHAPE bit.
             // Setting the ADD bit here works for all cases so we don't even bother checking other bits.
             _pendingFlags |= PENDING_FLAG_ADD_TO_SIMULATION;
-            setHovering(true);
         } else {
             if (_dynamicsWorld) {
                 _pendingFlags |= PENDING_FLAG_REMOVE_FROM_SIMULATION;
@@ -253,6 +252,7 @@ void DynamicCharacterController::setEnabled(bool enabled) {
             _pendingFlags &= ~ PENDING_FLAG_ADD_TO_SIMULATION;
             _isOnGround = false;
         }
+        setHovering(true);
         _enabled = enabled;
     }
 }
diff --git a/libraries/script-engine/src/AudioScriptingInterface.cpp b/libraries/script-engine/src/AudioScriptingInterface.cpp
index deb1e1e9e9..8bcc4a20cf 100644
--- a/libraries/script-engine/src/AudioScriptingInterface.cpp
+++ b/libraries/script-engine/src/AudioScriptingInterface.cpp
@@ -9,9 +9,10 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "AudioScriptingInterface.h"
+
 #include "ScriptAudioInjector.h"
 #include "ScriptEngineLogging.h"
-#include "AudioScriptingInterface.h"
 
 void registerAudioMetaTypes(QScriptEngine* engine) {
     qScriptRegisterMetaType(engine, injectorOptionsToScriptValue, injectorOptionsFromScriptValue);
@@ -69,3 +70,23 @@ ScriptAudioInjector* AudioScriptingInterface::playSound(Sound* sound, const Audi
         return NULL;
     }
 }
+
+void AudioScriptingInterface::injectGeneratedNoise(bool inject) {
+    if (_localAudioInterface) {
+        _localAudioInterface->enableAudioSourceInject(inject);
+    }
+}
+
+void AudioScriptingInterface::selectPinkNoise() {
+    if (_localAudioInterface) {
+        _localAudioInterface->selectAudioSourcePinkNoise();
+    }
+}
+
+void AudioScriptingInterface::selectSine440() {
+    if (_localAudioInterface) {
+        _localAudioInterface->selectAudioSourceSine440();
+    }
+}
+
+
diff --git a/libraries/script-engine/src/AudioScriptingInterface.h b/libraries/script-engine/src/AudioScriptingInterface.h
index b74c520670..9d02b8c9a1 100644
--- a/libraries/script-engine/src/AudioScriptingInterface.h
+++ b/libraries/script-engine/src/AudioScriptingInterface.h
@@ -29,6 +29,10 @@ protected:
     // this method is protected to stop C++ callers from calling, but invokable from script
     Q_INVOKABLE ScriptAudioInjector* playSound(Sound* sound, const AudioInjectorOptions& injectorOptions = AudioInjectorOptions());
     
+    Q_INVOKABLE void injectGeneratedNoise(bool inject);
+    Q_INVOKABLE void selectPinkNoise();
+    Q_INVOKABLE void selectSine440();
+    
 signals:
     void mutedByMixer();
     void environmentMuted();