fixed small stuff in evaluation