Add CNAME & fix stuff