Fix the stat counters
Update the template