Continuation of #42, rebased properly, and with feedback addressed.

Improved stats handling, and display IPs.
See #42.