Added substance to guard_stats()
Merge origin/master
Pushing to git so I can work on this shit on the bus to/from work tomorrow
Merge origin/master