bug fixes in evaluator, front-end, flow