Fixing labels and ordering of totals.
Fixed warning.