Adding (limited) extraction of main iterators based on locality, some fixes