Add editor and some fix bug