Satistics improvment & fixes