- Fixes to stats
- Minor optimizations