Added running and grand totals, cleaned up a little.