Fixed some code, broke some more