Fixing up numbers and totals