Corrections & additions to PaymentFlow