Bug fixing, computeVatToAdd methods written