Editor improvements