logging improvements 2