Updates for new email handling and support for partial payment

OK, partial support for partial payment.