search almost done.. improvements again