Updated stripe and various other functionality
Fixed Merge conflicts