Issue #6: fixes and tweaks for PaySafe Card  payment method