tweaking end behavior of save polly modes