More bug fixes to TimerService. Almost done polishing.