Tweaks and fixes to searching.
Update README.