Lots of updates, mostly new search interface and error handling