Changed to import in batches, to avoid limit problem; other improvements