some fix proposals for the report

I'll add comments saying what I changed, since diff is terrible at single line