WIP fix more bugts