updates for new evaluator facility

.. and ditching out the System.exit()  ;)