fixes on payment array and others