Fixed some timer/stopwatch issues. Addresses issue #15.