tokenizer regex repaired