Minor Category tweaks.
Merge branch 'lightspeed' of github.com:hach-que/Tychaia into lightspeed