fixed bugs
fix more bugs