Add progress logging and fix iterator increment