Fixes some baddies i've made