Logging improvements

:+1: