Fix minor state-change glitch
TOTAL OVERHAUL
Changed more keymappings