Minor changes to lexer and a comment