Module Categories & Unit Outcomes

Minor tweaks and enhancements.