fix more remarks