Fixed minor issues in Category