tweaks to the export verifier to better detect end conditions