editor and more fixes added.