Potential Fix for Number Output?

 Not sure if it actually outputs the numbers properly and formatted
in a nice way, @cg505 may want to look at this and do some changes.