fix more problems..