Re-enabled the speed preference.
Introduced padding to catch the change of direction earlier.