improvements suggested by martin

Merge request reports

Loading