Updated/fixed statistic recording
Removed comments