Fixed various bugs in #evolve