more editor and template changes