fix ev and add wf val and env