Fixed some bugs, changed some variable names and added assessment into
Evaluation.