Evaluators done, some bugs fixed