Big clean up of master

I'm checking in most everything. Also this is a slight update for the
MDR report.