fixed all of the shit