annotated XSD, reformatted CM

Incorporated DL's edits into CM reformatting