report and some code changes