- improve timing and logging