some fixes
some fixes with statistics