fixed some stuff, broke some stuff