Fix editor, lexer, extras