Add served data stats; bug fix