changing categories, fixing bugs