fix more bugs eeccchhh