Discounts + VAT

Fixes #59 and fixes #44