comments reworked.
Merge branch 'whois-testing'