Lexer issues fixed