Fixed bugs with combo updating

- Combos not updating when no sword held
- Combos not showing as finished when they should
- Combos not correctly setting to null when finished