Fixed issue with speed jumping when moving off display

Fixed bug #2 and toyed with the delays a little, everything seems to be
working reasonably well now