changed control methods a bit, completed keyboard input statements, mouse is not implemented yet
Merge remote-tracking branch 'origin/master'