Various changes for input system, weird behaviour going on