added search feature and some other stuff.