bug fixes for new report