Improve reports module somewhat