Fixed up some number formatting stuff