search is a little bit better now, still needs work