restructured categories and tweaks therein