Some more progress on the lexer