I either fixed some things, or broke some things