Fix editor, lexer, extras
Merge pull request #12 from centaurialpha/new-editor

Fix editor, lexer, extras