fix stuff, make it less bad