Cleaning up and starting on tagging

I forgot what I did, pretty sure I touched up some category names, some
regex.

I know I started on the tag generation at least. Probably.

:sake: