Improve wording and links