Various edits from account team