fix more highlitings