fixed stuff I just screwed up