some more logging changes, still figuring out how to properly handle all of that