fixed some things, broke some things