Lots of logging changes!