Multieditor support
Bug fixes