Added CNAME, and a few edits