Fixed bugs, evolving correctly