Sharing changes back, if you'd like them.  Still WIP, but thought I'd send a pull in case it made it easier to access my diffs.

Note: I think I dropped much of the node stats, so you may want to ignore that if you found those helpful.  I also haven't updated documentation/man pages, etc to reflect any changes I've made to cli args.