Added minor chanes for payment return and send mails