Successfully calc VAT addition
minor code changes