Fix bad variable
Make everything return speed (free for all modes)