Updated editor + small changes