Add very basic tokenizer improvement

Next up: sentence boundaries, etc