Minor working changes to serialisation
Comment update