tried to fix all the stuff git shoved in