Further improvements to the evolution system.