fix more small bugs