add editor and fix other