fixed all the staff, debugging now
debugged both types of evaluation