Finished the purchase payment improvements