fixed reports to reflect changes in code structure