Small improvements of the Editor API and performance