Logging all the things, also tweaked logging a bit