Merge copy and minor link changes into master