subbed in new search method, fixed a few minor bugs.