More work on the improved editor