Added an InputHandler to the Context class. Also did minor house-keeping.