Payment improvements
merge with master