Some more light edits in 3.2
Merge branch 'master' of https://github.com/elaine84/evolve