Fixing the CNAME, and some changes in the source not yet buit