Added some more lexer stuff.