improved stats, as suggested by Marius E