subtotals & totals calc updated