changes to report and other things to look better