SOme minor changes to map