cleanup of serializers, fixed some typos