More changes to payment flow. Error checking, etc.