fix more code, tired