many improvements to external unsubs