fix more derpege will need to clean all this up later properly