CE/improve runs

You tell me if that makes sense. It's almost always good to exit early if you can.