added serializers, units, some other random extras