Improvements for time

Some small improvements for timer. Trying not to be quite as stupid.