Pull June 5th

added many xsd fields, removed some terms with problematic ranges