Broke some stuff, fixed some stuff