Some more edits (wording etc.)