logging is fun :P
some formatting and logfile name
2 typos
Merge remote-tracking branch 'upstream/master'