more logging improvements