fix more glitches