Added PayPal support and various bug fixes