Did some more work on the lexer.