Major map/editor changes