Minor changes to timing and logging format