fixing exit criteria (again) and redirects