change categoryName and fix bugs