update references to fqdn
update comments