Improved crash handling / work on input system