minor fixes
Serialization - basics + implementation so far