reports fixes
merged
merged
refs seem to be working