fixed bug
fix more bugs