Updated wording & URLs