fixed some fucked up things :@