Rounding up components totals, and fixed bug, was duplicating math in the final total