A few changes in stopwatch for a nicer API