Add more details and fix subdomain mentions.