Stats tracking and fixes
Flock plugin WIP