archetype integration
misc updates