Adding another Serialization Unit and code tweaks

...her tweaks.