Several Improvements to Logging