smaller changes, working on the search