diff --git a/examples/guidedTour.js b/examples/guidedTour.js
index 3416e55d1c..1882b527d7 100644
--- a/examples/guidedTour.js
+++ b/examples/guidedTour.js
@@ -17,9 +17,9 @@ function update(deltaTime) {
   if (Math.random() < deltaTime) {
     guide = AvatarList.avatarWithDisplayName(leaderName);
     if (guide && !isGuide) {
-      print("found a guide!");
+      print("Found a tour guide!");
       isGuide = true;
-    } else if (!isGuide) {
+    } else if (!guide && isGuide) {
       print("Lost My Guide");
       isguide = false;
     }
diff --git a/examples/headMove.js b/examples/headMove.js
index b9330153fc..f377409cb8 100644
--- a/examples/headMove.js
+++ b/examples/headMove.js
@@ -17,6 +17,8 @@ var willMove = false;
 var warpActive = false;
 var warpPosition = { x: 0, y: 0, z: 0 };
 
+var hipsToEyes;
+
 //  Overlays to show target location 
 
 var WARP_SPHERE_SIZE = 0.15;
@@ -43,8 +45,11 @@ var movingWithHead = false;
 var headStartPosition, headStartDeltaPitch, headStartFinalPitch, headStartRoll, headStartYaw;
 var deltaYaw = 0.0;
 var keyDownTime = 0.0;
+var timeSinceLastUp = 0.0;
 var watchAvatar = false; 
 var oldMode; 
+var lastYawTurned = 0.0;
+var startPullbackPosition;
 
 function saveCameraState() {
     oldMode = Camera.getMode();
@@ -65,6 +70,7 @@ function activateWarp() {
 var TRIGGER_PULLBACK_DISTANCE = 0.04;
 var WATCH_AVATAR_DISTANCE = 1.5;
 var MAX_PULLBACK_YAW = 5.0;
+var MAX_PULLBACK_PITCH = 5.0;
 
 var sound = new Sound("http://public.highfidelity.io/sounds/Footsteps/FootstepW2Right-12db.wav");
 function playSound() {
@@ -74,35 +80,44 @@ function playSound() {
     options.volume = 1.0;
     Audio.playSound(sound, options);
 }
-
 var WARP_SMOOTHING = 0.90;
 var WARP_START_TIME = 0.50;
-var WARP_START_DISTANCE = 1.0;
+var WARP_START_DISTANCE = 1.5;
 var WARP_SENSITIVITY = 0.15;
 
+var fixedHeight = true;
+
 function updateWarp() {
     if (!warpActive) return;
 
-    var look = Quat.getFront(Camera.getOrientation());
+    var viewEulers = Quat.safeEulerAngles(Camera.getOrientation());
     var deltaPosition = Vec3.subtract(MyAvatar.getTrackedHeadPosition(), headStartPosition);
     var deltaPitch = MyAvatar.getHeadFinalPitch() - headStartFinalPitch;
     deltaYaw = MyAvatar.getHeadFinalYaw() - headStartYaw;
+    viewEulers.x -= deltaPitch;
+    var look = Quat.getFront(Quat.fromVec3Degrees(viewEulers));
 
-    willMove = (!watchAvatar && (keyDownTime > WARP_START_TIME));
+    willMove = (keyDownTime > WARP_START_TIME);
 
     if (willMove) {
-        //var distance = Math.pow((deltaPitch - WARP_PITCH_DEAD_ZONE) * WARP_SENSITIVITY, 2.0);
         var distance = Math.exp(deltaPitch * WARP_SENSITIVITY) * WARP_START_DISTANCE;
-        var warpDirection = Vec3.normalize({ x: look.x, y: 0, z: look.z });
-        warpPosition = Vec3.mix(Vec3.sum(MyAvatar.position, Vec3.multiply(warpDirection, distance)), warpPosition, WARP_SMOOTHING);
+        var warpDirection = Vec3.normalize({ x: look.x, y: (fixedHeight ? 0 : look.y), z: look.z });
+        var startPosition = (watchAvatar ? Camera.getPosition(): MyAvatar.getEyePosition());
+        warpPosition = Vec3.mix(Vec3.sum(startPosition, Vec3.multiply(warpDirection, distance)), warpPosition, WARP_SMOOTHING);
     }
 
     var height = MyAvatar.getEyePosition().y - MyAvatar.position.y;
+    var cameraPosition;
 
-    if (!watchAvatar && (Math.abs(deltaYaw) < MAX_PULLBACK_YAW) && (deltaPosition.z > TRIGGER_PULLBACK_DISTANCE)) {
+    if (!watchAvatar && 
+        (Math.abs(deltaYaw) < MAX_PULLBACK_YAW) && 
+        (Math.abs(deltaPitch) < MAX_PULLBACK_PITCH) && 
+        (Vec3.length(deltaPosition) > TRIGGER_PULLBACK_DISTANCE)) {
         saveCameraState();
-        var cameraPosition = Vec3.subtract(MyAvatar.position, Vec3.multiplyQbyV(Camera.getOrientation(), { x: 0, y: -height, z: -height * WATCH_AVATAR_DISTANCE }));
+        cameraPosition = Vec3.subtract(MyAvatar.position, Vec3.multiplyQbyV(Camera.getOrientation(), { x: 0, y: -height, z: -height * WATCH_AVATAR_DISTANCE }));
         Camera.setPosition(cameraPosition);
+        cameraPosition = Camera.getPosition();
+        startPullbackPosition = cameraPosition;
         watchAvatar = true;
     }
 
@@ -128,13 +143,14 @@ function finishWarp() {
         visible: false,
     });
     if (willMove) {
+        warpPosition.y -= hipsToEyes;
         MyAvatar.position = warpPosition;
         playSound();
     } 
 }
 
 function update(deltaTime) {
-
+    timeSinceLastUp += deltaTime;
     if (movingWithHead) {
         keyDownTime += deltaTime;
         updateWarp();
@@ -145,6 +161,7 @@ Controller.keyPressEvent.connect(function(event) {
     if (event.text == "SPACE" && !event.isAutoRepeat && !movingWithHead) {
         keyDownTime = 0.0;
         movingWithHead = true;
+        hipsToEyes = MyAvatar.getEyePosition().y - MyAvatar.position.y;
         headStartPosition = MyAvatar.getTrackedHeadPosition();
         headStartDeltaPitch = MyAvatar.getHeadDeltaPitch();
         headStartFinalPitch = MyAvatar.getHeadFinalPitch();
@@ -152,26 +169,31 @@ Controller.keyPressEvent.connect(function(event) {
         headStartYaw = MyAvatar.getHeadFinalYaw();
         deltaYaw = 0.0;
         warpPosition = MyAvatar.position;
+        warpPosition.y += hipsToEyes; 
         activateWarp();
     }
 });
 
-var TIME_FOR_TURN_AROUND = 0.50;
 var TIME_FOR_TURN = 0.25;
+var DOUBLE_CLICK_TIME = 0.50;
 var TURN_AROUND = 180.0;
 
 Controller.keyReleaseEvent.connect(function(event) {
     if (event.text == "SPACE" && !event.isAutoRepeat) {
         movingWithHead = false;
-        if (keyDownTime < TIME_FOR_TURN_AROUND) {
-            if (keyDownTime < TIME_FOR_TURN) {
-                var currentYaw = MyAvatar.getHeadFinalYaw();
-                MyAvatar.orientation = Quat.multiply(Quat.fromPitchYawRollDegrees(0, currentYaw, 0), MyAvatar.orientation);
-            } else {
-                MyAvatar.orientation = Quat.multiply(Quat.fromPitchYawRollDegrees(0, TURN_AROUND, 0), MyAvatar.orientation);
-            }
+        if (timeSinceLastUp < DOUBLE_CLICK_TIME) {
+            // Turn all the way around 
+            var turnRemaining = TURN_AROUND - lastYawTurned;
+            lastYawTurned = 0.0;
+            MyAvatar.orientation = Quat.multiply(Quat.fromPitchYawRollDegrees(0, TURN_AROUND, 0), MyAvatar.orientation);
+            playSound();
+        } else if (keyDownTime < TIME_FOR_TURN) {
+            var currentYaw = MyAvatar.getHeadFinalYaw();
+            lastYawTurned = currentYaw;
+            MyAvatar.orientation = Quat.multiply(Quat.fromPitchYawRollDegrees(0, currentYaw, 0), MyAvatar.orientation);
             playSound();
         }
+        timeSinceLastUp = 0.0;
         finishWarp();
         if (watchAvatar) {
             restoreCameraState();