some updates to evolution code