More map editor changes