Fixed some bugs. Improved evaluation mechanisms