Broke some things, fixed some things