fix more issues for first contributor