Fixed some stuff. Broke some stuff.