PayPal integration (part 2) and some small changes