refactor of search, cutting tools - to support new model, general housekeeping