added stopwatches
minor bugfix