minor fix to stopwatches
make preparation configurable