Cleaned up the code some more and made a small adjustment to the string search backup