Archetype tweaks + improved archetype doc