Lexer comments and bug fixes.