added evaluation data plus minor modifications