Adding categories, take 2, and minor cleanup