reordered methods for drawing in Map, added getters and merged TileSet
into Map