fixed some, broke some