Fixed some bugs, broke some things