Timer: bug fix, updated labels