Comments and expand Map and Tile