Some small work on parser and lexer.