broke some stuff, fixed some stuff