Logging improvements

ok