stopwatch and bug fixes