New Features
- Timer fixes