Small Payment, etc entity cleanups
Small cleanups and changes to make more resilient
Small comment changes for clarification
Initially complete post#Payment service