more changes to jaxb, xml and xsd.