Fixed various Timer Bugs