few tokenization bugs