restructured the payment fee fields
more of the payment fee and its tax