fix more bugs