fix remarks
fix more remarks