Fixes overall to the timer logic