minor fixes in evaluate