added CNAME and minor changes