As promised, here is the updated document with Henrik's feedback. I have included the XSD for this version as well.
John