buggfixes and added searcher(not complete)