PayPal integration

Some amends for PayPal integration