fix more bugs!