Improve two of the timer tools. Minor cleanup.