fix more bugs
Merge