some fixes to payment