More fiddling with reports, not quite there yet.
Minor edits