improve debug / error logging a bit, and there are a lot of reformats tagging along.