fixed the categories and other small changes