Added some states, fixed InputHandler bug