Update wording, fix links