Recalculating Totals Produces Incorrect Results - Take Deux

Made a new branch since the reorganization of the payment details screen really messed with the commits on this one. Isolated just my commits into a new branch and PR.

#2768