Improved controls

I like that it's possible to fix a bug by just deleting a few lines. 

Fixes #21