Even moar models + ModelsInGeneral fix