Bug fix and more stats