Added stopwatches and fixed issues.