bigger map
clean up
more clean up