Some final touches before I start using the iterator for real.