editor tweaks and fix