Various speed improvements. Better discovering