fix more filename + bug