fix typo, fix more warnings.