fixed some stuff, broke some other stuff