Did a little more work on the lexer