Tweak the code for doing stats
Tweak validate scripts and settings