Minor cleanups + bit more detailed logging
Resolved merge conflict