Misc changes

Adjustments to logging, visual cleanup to some code.