CNAME

Added CNAME and various updates