implemented editor + minor changes