Adding categories, some cleanup