Fixed Timer Bugs