Map Change / icon additions / last minute fixes