Bunch of text edits and updates