added epsilon-ego
cleanup