My edits

to you @Cadair. I'll expect input from Jack at around 9 am (EST) and will submit a final PR at 11 am (EST).