Update category and fix bugs