future past perfect tense, other minor tweaks