Converting to InputManager, stage 1
Some tweaks