Initial commit for always cohort inline discussions plus spelling fix

Same comment as before re: "id"