Refactoring and additional failure case.

No repeating combos.
Restored combo timing.