Issue #180, category correction

Fixing some categories per #180.