fix more shit and stuff