made some fixes and tweaks to Evaluation.java