Create the archetype and fix some issues