Fixes & Tweaks
Added CNAME