Fixed the timer and the displaying of it