fix more oversights...