Added stopwatch

Also minor changes in timer