Fixed 2D, added InputManager