Log time spent
Minor output modifications
Added more switches