Changed categories + fix some bugs