Finished iterator, started fix for multiple spaces