TJ's addition of number formatter and bug fixes and more tests