Corrected encoding name
Updated TODO
Fixed bug in serialization demo