escaped characters and strings now tokenized correctly