fix more crap