Added receipts, fixed service