more exit tweaks