implemented lookups and cleaned up serializers