typo in uneval code
various improvements