added some things and broke some things