Revert "Revert "better rendering of numbers""

This reverts commit ed10e840150a23014c2782588c3eb8ed45d35e75.