string lexing improved