Commenting error fixed and category selection added