improve WHOIS messaging