minor refactoring and input manager fix
Merge branch 'master' of https://github.com/n8fern/Toy-Hell