minor changes, added tokenized serialization to binary data