Editor

merge newer but trivial stuff on EDITOR with master.