cleanup, fixed some missing stats stuff