Normalize UsStateName uri's
Correct cardinality on some elements, name chnage tweaks