More minor work on archetypes
Merge pull request #12 from mjmeans/pfs

More minor work on archetypes