some edits on .xsd, .xml and classes