payment_cash and fixes