Some more tweaks on the tokenization and generation