better tokenization, fixed build