added stopwatch, more comments