fixed small bug in Evaluator (remainder misspelled); cleaned up code a
bit