various fixes and dns changes