Added search and some minor changes