A small improvement in the evaluation speed. Other small bug fixes.