Eric: general housekeeping, refactor of Cutting tools and Search

...eeping