schemas updated to work better with jaxb, ready for release