fixed things and broke some things