Do a lot of cross-referencing of categories, thanks to an emacs lisp script. This is a fairly significant update.