improve logging, add timings