Some small clenaups
Add some CNAME todo