fixed all the shit xD