cleaned up stats and put more fine grained control on from/until