Minor changes to the categories and a TODO comment