updated with category aliases and less HTML crap