Fixed Some Issues with the Timer

Still a bit buggy…
Commit 2

:)