Improving with discounts and better total fields (use Calc values)

Signed-off-by: Luke Bowerman <luke@wildcowstudios.com>