Fixed some stuff, broke some others.