Changed all subdomain references + add a few corrections