Add search feature, misc fixes.