updates to address paypal's preference issues directly