more pay edits
Merge branch 'payments'