jacket-7
lexer bugfix, some refactoring