Fixed number generator to generate the correct number of digits
Added decimal generator