some fixes and CNAME