bug fixes for reports
merge conflicts resolved