improvements to self editor