all of trevor’s fixes now in