Minor edits, mostly to Lexer