Wording updates, re-organised sections