Cleanups. FillPaymentDetails fixes.

do we need it?