#451 polish the archetypes more