check uniqueness during serialisation, fix nullpointer issues in rewrite...

check uniqueness during serialisation, fix nullpointer issues in rewrite checks, add test for node removal