Fixed up some stuff with the vat.