More work on the map editor