added more fixes for timer: need to finish two more tests