XSD config, fixes, reformat, upgrades