pushed some of matt's changes to key archetype