add better snapshot names + reshuffle order of functions