added a few lines and improved a little bit
Exponent and fix in evaluator