Broke some stuff. Fixed other stuff.