validate xml with xsd + small fixes

validate xml with xsd + small fixes