Extended InputManager
A few additions and bugfixes