Merged the search and string types.  Much better.
Some tweaks to some comments.