fixed xsd error
improved version of evaluation engine