PMC-20177 - cleaning stuff up
PMC-20177 - Got logging working consistently