Added some more logging improvements