- small improvements to stop()