some fixes, add order redaction