Timing/logging improvements