Fixes a few bugs and adds the required fields to the serializer
Fixes a few bugs and adds the required fields to the serializer

klpdotorg/dubdubdub,klpdotorg/dubdubdub,klpdotorg/dubdubdub,klpdotorg/dubdubdub