Broke some stuff, Fixed some stuff