villainy subTypes added to/exposed in storyGen, other refs deleted, and tests added