Update b-stats source with various improvements