Added better categories, and category index.