Metro report tweaks

Work not complete yet for #143 Opened this PR for visibility - will let you know when can be merged :)