master: cleanup from the other night, forgot to commit -- also the addition of some basic statistics in a pojo.