New fields, Payment submit in validate function, other small fixes