associations and fixes to payment model