fix more hyphen issues