Serialization of some more nodes + small changes in prev implemetation