add category and fix some question