Fixed Some Ish, broke some more.