More changes

A few more corrections- names and totals