corrected several places, added to eval and discussion