broke some stuff, fixed some other stuff