Fixing the crap that I've made pt II