re-factoring the EvalLimit portion of the code (and other minor comment / typo fixes)