Fixes and changes to VAT payment calculator