Updated logging to better fit reporting needs