Add Draft property, clean up malformed archetypes, add tests