work on format in editor
tweaks on editor