Pre-authorizations and return trips now roughly working