fix more bugs.