Map Iterator

And some updates, etc.