cleaner changes
Time changes
slight change to logger