update stats collection + fix