Merge in text wrap and lengend updates