and fix more things