Search revamp

You have me thinking about this. If I can prevent the code from deadlock, why not. I can't predict what could happen with the code at any time. Especially as it grows. So why not always give the program the best chance to shutdown cleanly.