fixes and serializer improvements