fixed all of the json stuff