More work on the lexer and parser