fix more issues after working with Issac