better annotation of GATOC.evolve and minor refactoring