Logging improvements
more logging improvements