Updates per metadata group discussion

I think I captured most of what we talked about yesterday. The diff for the dcterms:type is sloppy as I edited it in a backwards sort of order (edited the wrong one first, but kept going, getting the same result I wanted).