more fixes to TIME and logging