better editor handling