iterative map improvements
more map work