improved controls and fixed some bugs concerning start/stop behaviour