Tweaked destination picking and waypoint addition.