And 1 more to fix more stuff i messed up