More editor work