Split up the receipts logic a bit, fixed the fuxed current_ methods.