More stopwatch stuff, bug fixes