Improvements to the way the timer works.