Minor changes in report and code