Re-enabled paypal proper, and fixed tracking log variable overwrite