modified a bunch of files for better categories.