Fixed timer Bugs