- Fixed alternate break / undo bug
- Refactoring