Add more stats, closes #12