updated report - major fixes