lots of time related fixes and clarifications