improvements to pause handling