Fixes to the timer and the other things