More work on lexer, adding debugging output