Tweaked timings and fixed "fire" control code