Cleaned up map and added setTile method to Units