tweaked tokenizer regex