Added comments and checks to evaluator, and more wrapper functions