fix more bugs :)