Worked on fixing category manager bugs, WIP