code review comments, hopefully address some of the WTF's around logging!