switched default xml serializer, general tidy up