editor fixed (minor bugs only :)