cleaned
partial tokenization fixed
better tests