Added search and other niceties.