Replaced joystick axis with one that should work independent of framerate (and on XBox 360 controllers). Increased COMBO_TIME timer one second