Fixing the tokenizer, half-way through