more progress on map editor