fix more bugs in new convo. merrge?