fixed bad things and stuff