Fixed most everything