bugfixes in refactored models/serializers