2D Map + Iterator added
map improved, kollision improved