Lexer fixes. Work on syntax