add missing bits, remove PowerDNS references