Eng 6115 Tweak a bunch of error logging and clean up some unrelated things