fix more of the things