Update report to show mapped names if available

Also updated some documentation. Much more documentation is needed
before the end, i'm just saving most of it for last.