Import fields in batches.
Better comment.
Minor UI fixes.