Fix stats error, up number of samples.
more tweaks