adding XSD and minor changes