Refined a bit some occurrences in xsd