Fixes to equipment and continued work on archetypes