Fixing Archetypes
Minor Reformatting + Solution Stack Lookup

--HG--
extra : amend_source : 2f9dcb6d249638c995cbd1f394a084056823e688