Fixes #90, cleans up
 the category functionality a little bit