Keyboard fix, explosion restructuring