Payment flow enhancements

by Andrew McKay