Add speed control
Minor tweaks
Updated to match code
Minor tweaks
Fixed typo