Fix all issues. Add timeout for controls.
Merge branch 'robert' into mouse_controls_swapped