Improved formatting of numbers in the text and a more explicit data filling strategy.

Now this is the last ... honest!