bug fixes around payment and receipt