Finished phase 1 logging improvements