Removed an evaluation issue
Improved the evaluation and fixed a bug. Got whipped