Implemented refunds and retries
Cosmetics changes