Paypal fork

Mostly minor changes/improvements as I was going through some code.