Some payment changes + Pre model fixes