fixed the fuckups again