fix back the fucked up stuff