fixed some, broke some, just saving