Payment
Minor fixes