XSD fixed up, need to get validation working