Correcting handling of case and fixing problems with evaluation.