Lots of updates in the client/serialization section
Minor serialization updates