Cleaning up some logging, adding some to debug