Reorg and bug fix on commas in numbers