more tense switching and wordsmithing