fixes, new categories and markers