fix messaging report
consolidate mach views, wrap billables correctly, fix messaging report