Added search (-g) and more