fix stuff
add searcher