Cleaned up categories and more tweaks