diff --git a/ArduCopter/ArduCopter.pde b/ArduCopter/ArduCopter.pde
index b743116530077929fd81a77ba96ac3acbf993827..ac7a70b1a03f637c3565faca3fc882ebf8f74230 100644
--- a/ArduCopter/ArduCopter.pde
+++ b/ArduCopter/ArduCopter.pde
@@ -1906,6 +1906,7 @@ void update_throttle_mode(void)
             get_throttle_althold_with_slew(wp_nav.get_desired_alt(), -wp_nav.get_descent_velocity(), wp_nav.get_climb_velocity());
             set_target_alt_for_reporting(wp_nav.get_desired_alt()); // To-Do: return get_destination_alt if we are flying to a waypoint
         }
+        // To-Do: explicitly set what the throttle output should be (probably min throttle).  Without setting it the throttle is simply left in it's last position although that is probably zero throttle anyway
         break;
 
     case THROTTLE_LAND:
diff --git a/ArduCopter/commands_logic.pde b/ArduCopter/commands_logic.pde
index 74c0ab88da06df985d73ee58cf6466506f41aeb0..31b8bd25df09ce46643dec2815d2445ab3e225b3 100644
--- a/ArduCopter/commands_logic.pde
+++ b/ArduCopter/commands_logic.pde
@@ -254,7 +254,6 @@ static void do_takeoff()
 }
 
 // do_nav_wp - initiate move to next waypoint
-// note: caller should set yaw mode
 static void do_nav_wp()
 {
     // set roll-pitch mode
@@ -319,6 +318,9 @@ static void do_loiter_unlimited()
     // set throttle mode to AUTO which, if not already active, will default to hold at our current altitude
     set_throttle_mode(THROTTLE_AUTO);
 
+    // hold yaw
+    set_yaw_mode(YAW_HOLD);
+
     // get current position
     // To-Do: change this to projection based on current location and velocity
     Vector3f curr = inertial_nav.get_position();
@@ -384,6 +386,9 @@ static void do_loiter_time()
     // set throttle mode to AUTO which, if not already active, will default to hold at our current altitude
     set_throttle_mode(THROTTLE_AUTO);
 
+    // hold yaw
+    set_yaw_mode(YAW_HOLD);
+
     // get current position
     // To-Do: change this to projection based on current location and velocity
     Vector3f curr = inertial_nav.get_position();