fixed the fuckd up parts