Route to editor and minor fixes