Updated editor and some other stuff