Fixes #12 which was a nasty little bug
Improved general handling of stats queries - less objects being created, code a bit more consistent/homogeneous, less 'for' loops over the data,  everything that we like