More edits, marshalling for xml reports.  Need to decide XML report
format - go to the scripts for that.