Further changes to saveMap()