added more events
correct stopwatch location