Improved controls, fixes #21

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