added PaymentActivity; small changes and refinements