added search,and improved few minor things