change categoryName and fix bugs

remove unused comments / test code