Reduce WHOIS amount by a lot, a few other minor changes.