diff --git a/.buildlibrary b/.buildlibrary
index 5823009..7de9a02 100644
--- a/.buildlibrary
+++ b/.buildlibrary
@@ -1,4 +1,4 @@
-ValidationKey: '528165690'
+ValidationKey: '530787363'
 AutocreateReadme: yes
 AcceptedWarnings:
 - 'Warning: package .* was built under R version'
diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml
index 5e205ab..89c8e53 100644
--- a/.github/workflows/check.yaml
+++ b/.github/workflows/check.yaml
@@ -4,11 +4,13 @@ on:
   push:
     branches: [main, master]
   pull_request:
+    types: [opened, synchronize, reopened, ready_for_review]
     branches: [main, master]
 
 jobs:
   check:
     runs-on: ubuntu-latest
+    if: github.event.pull_request.draft == false
 
     steps:
       - uses: actions/checkout@v4
diff --git a/CITATION.cff b/CITATION.cff
index 066d73f..5941ace 100644
--- a/CITATION.cff
+++ b/CITATION.cff
@@ -2,8 +2,8 @@ cff-version: 1.2.0
 message: If you use this software, please cite it using the metadata from this file.
 type: software
 title: 'mrvalidation: madrat data preparation for validation purposes'
-version: 2.61.30
-date-released: '2025-05-05'
+version: 2.61.33
+date-released: '2025-08-11'
 abstract: Package contains routines to prepare data for validation exercises.
 authors:
 - family-names: Bodirsky
diff --git a/DESCRIPTION b/DESCRIPTION
index bda61ea..19f1b43 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,8 +1,8 @@
 Type: Package
 Package: mrvalidation
 Title: madrat data preparation for validation purposes
-Version: 2.61.30
-Date: 2025-05-05
+Version: 2.61.33
+Date: 2025-08-11
 Authors@R: c(
     person("Benjamin Leon", "Bodirsky", , "bodirsky@pik-potsdam.de", role = c("aut", "cre")),
     person("Stephen", "Wirth", role = "aut"),
diff --git a/NAMESPACE b/NAMESPACE
index 60dd78e..0a8346e 100644
--- a/NAMESPACE
+++ b/NAMESPACE
@@ -109,7 +109,6 @@ importFrom(tidyr,drop_na)
 importFrom(tidyr,expand_grid)
 importFrom(tidyr,nest)
 importFrom(tidyr,pivot_longer)
-importFrom(tidyr,pivot_wider)
 importFrom(tidyr,unnest)
 importFrom(tools,file_path_sans_ext)
 importFrom(utils,download.file)
diff --git a/R/calcNitrogenSurplusByCrop.R b/R/calcNitrogenSurplusByCrop.R
index 1965c95..b3979ed 100644
--- a/R/calcNitrogenSurplusByCrop.R
+++ b/R/calcNitrogenSurplusByCrop.R
@@ -7,7 +7,7 @@
 #' @return List of magpie objects with results on country level, weight on country level, unit and description.
 #' @author Benjamin Leon Bodirsky
 #' @seealso
-#' \code{\link{calcNitrogenBudgetCropland}}
+#' \code{\link[mrcommons]{calcNitrogenBudgetCropland}}
 #' @examples
 #' 
 #' \dontrun{ 
diff --git a/R/calcValidDemand.R b/R/calcValidDemand.R
index 5b1adee..59ef0d1 100644
--- a/R/calcValidDemand.R
+++ b/R/calcValidDemand.R
@@ -9,7 +9,7 @@
 #' @return List of magpie objects with results on country level, weight on country level, unit and description.
 #' @author Benjamin Leon Bodirsky, Isabelle Weindl
 #' @seealso
-#' \code{\link{calcFoodSupplyPast}},
+#' \code{\link[mrcommons]{calcFoodSupplyPast}},
 #' \code{\link{calcValidLivestockShare}}
 #' @examples
 #'
diff --git a/R/calcValidFeed.R b/R/calcValidFeed.R
index 69e341d..841da38 100644
--- a/R/calcValidFeed.R
+++ b/R/calcValidFeed.R
@@ -8,8 +8,8 @@
 #' @return List of magpie objects with results on country level, weight on country level, unit and description.
 #' @author Benjamin Leon Bodirsky
 #' @seealso
-#' \code{\link{calcFoodSupplyPast}},
-#' \code{\link{calcValidLivestockShare}}
+#' \code{\link[mrcommons]{calcFoodSupplyPast}},
+#' \code{\link[mrvalidation]{calcValidLivestockShare}}
 #' @examples
 #' \dontrun{
 #' calcOutput("ValidFeed")
diff --git a/R/calcValidFeedConversion.R b/R/calcValidFeedConversion.R
index d08f1b5..c7ec41c 100644
--- a/R/calcValidFeedConversion.R
+++ b/R/calcValidFeedConversion.R
@@ -9,7 +9,7 @@
 #' @return List of magpie objects with results on country level, weight on country level, unit and description.
 #' @author Benjamin Leon Bodirsky, github Copilot
 #' @seealso
-#' \code{\link{calcFoodSupplyPast}},
+#' \code{\link[mrcommons]{calcFoodSupplyPast}},
 #' \code{\link{calcValidLivestockShare}}
 #' @examples
 #' \dontrun{
diff --git a/R/calcValidGrassLSUha.R b/R/calcValidGrassLSUha.R
index ed6d863..e227fd4 100644
--- a/R/calcValidGrassLSUha.R
+++ b/R/calcValidGrassLSUha.R
@@ -4,7 +4,7 @@
 #' @return List of magpie objects with results on country level, weight on country level, unit and description.
 #' @author Marcos Alves
 #' @seealso
-#' \code{\link{calcFAOmassbalance}},
+#' \code{\link[mrcommons]{calcFAOmassbalance}},
 #' @examples
 #' \dontrun{
 #' calcOutput("ValidGrassLSUha")
diff --git a/R/calcValidGrassSoilCarbon.R b/R/calcValidGrassSoilCarbon.R
deleted file mode 100644
index c7aabe4..0000000
--- a/R/calcValidGrassSoilCarbon.R
+++ /dev/null
@@ -1,59 +0,0 @@
-#' @title calcValidGrassSoilCarbon
-#' @description calculates the validation data for grasslands
-#'
-#' @param datasource Datasources for validation data
-#' @param model trained model ID
-#' @param lpjml lpjml version
-#'
-#' @return List of magpie objects with results on country level, weight on country level, unit and description.
-#' @author Marcos Alves
-#'
-#' @examples
-#' \dontrun{
-#' calcOutput("ValidGrassSoilCarbon")
-#' }
-#' @importFrom tidyr pivot_wider
-
-
-calcValidGrassSoilCarbon <- function(datasource = "ISIMIP3b:IPSL-CM6A-LR:ssp126:1965-2100", model = "9eaf9b", lpjml) {
-
-    datasource_split <- toolSplitSubtype(datasource, list(version = NULL, climatemodel = NULL, scenario = NULL, years = NULL))
-
-    land_ini_LUH2v2  <- calcOutput("LUH2v2", aggregate = F, landuse_types = "LUH2v2", cellular = TRUE)
-    soilc_pastr_past_tha <- calcOutput("CollectSoilCarbonPastr", past_mngmt = "me2", lpjml = lpjml, climatemodel = datasource_split$climatemodel, aggregate = F, scenario = paste0(datasource_split$scenario, "/co2/Nreturn0p5/limN"), sar = 1)
-    soilc_range_past_tha <- calcOutput("RangeSoilCarbonHist", subtype = datasource, model = model, lpjml = lpjml, aggregate = F)
-    past <- getYears(soilc_range_past_tha)
-
-    map_reg <- toolGetMapping(type = "regional", name = "clustermapping.csv", where = "mappingfolder")
-
-    soilc_range_past_mt      <- setNames(land_ini_LUH2v2[, past, "range"] * soilc_range_past_tha, "range")
-    soilc_pastr_past_mt      <- setNames(land_ini_LUH2v2[, past, "pastr"] * soilc_pastr_past_tha[, past, "pastr"], "pastr")
-
-    soilc_grassL_past_mt     <- setNames(mbind(soilc_pastr_past_mt, soilc_range_past_mt), c("pastr", "range"))
-    soilc_grassL_past_mt     <- toolAggregate(soilc_grassL_past_mt, rel = map_reg, from = "cell", to = "region")
-    glo <- dimSums(soilc_grassL_past_mt, dim = 1)
-    soilc_grassL_past_mt     <- mbind(soilc_grassL_past_mt, glo)
-    soilc_grassL_past_mt_tmp <- soilc_grassL_past_mt
-    soilc_grassL_past_mt     <- setNames(soilc_grassL_past_mt, paste0("Resources|Soil Carbon|Grassland|+|", reportingnames(getNames(soilc_grassL_past_mt, dim = 1)), "|Total (MtC)"))
-    soilc_grassL_past_mt_T   <- setNames(dimSums(soilc_grassL_past_mt, dim = 3), paste0("Resources|Soil Carbon|Grassland|Total (MtC)"))
-
-    land_ini_LUH2v2_reg <- toolAggregate(land_ini_LUH2v2[, past, c("pastr", "range")], rel = map_reg, from = "cell", to = "region")
-    glo <- dimSums(land_ini_LUH2v2_reg, dim = 1)
-    land_ini_LUH2v2_reg <- mbind(land_ini_LUH2v2_reg, glo)
-    soilc_range_pastr_tha_reg <- setNames(soilc_grassL_past_mt_tmp[, , c("pastr", "range")] / land_ini_LUH2v2_reg[, , c("pastr", "range")], paste0("Resources|Soil Carbon|Grassland|+|", reportingnames(c("pastr", "range")), "|Density (tC per ha)"))
-    soilc_range_pastr_tha_reg[is.infinite(soilc_range_pastr_tha_reg) | is.nan(soilc_range_pastr_tha_reg)] <- 0
-    soilc_range_pastr_tha_reg_A <- setNames(dimSums(soilc_grassL_past_mt_T, dim = 3) / dimSums(land_ini_LUH2v2_reg, dim = 3),  paste0("Resources|Soil Carbon|Grassland|Density (tC per ha)"))
-
-    stock <- mbind(soilc_grassL_past_mt, soilc_grassL_past_mt_T, soilc_range_pastr_tha_reg, soilc_range_pastr_tha_reg_A)
-
-    stock <- add_dimension(stock, dim = 3.1, add = "scenario", nm = "historical")
-    stock <- add_dimension(stock, dim = 3.2, add = "model",    nm = paste0(datasource_split$climatemodel, "_", model))
-
-  return(list(x = stock,
-              weight = NULL,
-              unit = "tC",
-              description = "Carbon Stocks",
-              isocountries = FALSE)
-
-  )
-}
diff --git a/R/calcValidKcal.R b/R/calcValidKcal.R
index 16a1333..ff12134 100644
--- a/R/calcValidKcal.R
+++ b/R/calcValidKcal.R
@@ -10,7 +10,7 @@
 #' @return List of magpie objects with results on country level, weight on country level, unit and description.
 #' @author Benjamin Leon Bodirsky, Kristine Karstens
 #' @seealso
-#' \code{\link{calcFoodSupplyPast}},
+#' \code{\link[mrcommons]{calcFoodSupplyPast}},
 #' \code{\link{calcValidLivestockShare}}
 #' @examples
 #' \dontrun{
diff --git a/R/calcValidLivestockDemStructure.R b/R/calcValidLivestockDemStructure.R
index bf2fcfa..55aacde 100644
--- a/R/calcValidLivestockDemStructure.R
+++ b/R/calcValidLivestockDemStructure.R
@@ -6,7 +6,7 @@
 #' @return List of magpie objects with results on country level, weight on country level, unit and description.
 #' @author Isabelle Weindl
 #' @seealso
-#' \code{\link{calcFoodSupplyPast}},
+#' \code{\link[mrcommons]{calcFoodSupplyPast}},
 #' \code{\link{calcValidLivestockShare}}
 #' @examples
 #'
diff --git a/R/calcValidLivestockShare.R b/R/calcValidLivestockShare.R
index f421a3e..510a94e 100644
--- a/R/calcValidLivestockShare.R
+++ b/R/calcValidLivestockShare.R
@@ -6,7 +6,7 @@
 #' @return List of magpie objects with results on country level, weight on country level, unit and description.
 #' @author Benjamin Leon Bodirsky
 #' @seealso
-#' \code{\link{calcFoodSupplyPast}},
+#' \code{\link[mrcommons]{calcFoodSupplyPast}},
 #' \code{\link{calcValidKcal}}
 #' @examples
 #'
diff --git a/R/calcValidManure.R b/R/calcValidManure.R
index 007b196..e714103 100644
--- a/R/calcValidManure.R
+++ b/R/calcValidManure.R
@@ -6,8 +6,8 @@
 #' @return List of magpie objects with results on country level, weight on country level, unit and description.
 #' @author Benjamin Leon Bodirsky
 #' @seealso
-#' \code{\link{calcExcretion}},
-#' \code{\link{calcExcretionIPCC}}
+#' \code{\link[mrcommons]{calcExcretion}},
+#' \code{\link[mrcommons]{calcExcretionIPCC}}
 #' @examples
 #'
 #' \dontrun{
diff --git a/R/calcValidNitrogenBudgetCropland.R b/R/calcValidNitrogenBudgetCropland.R
index 48a16c1..d95cdaf 100644
--- a/R/calcValidNitrogenBudgetCropland.R
+++ b/R/calcValidNitrogenBudgetCropland.R
@@ -11,7 +11,7 @@
 #' @return List of magpie objects with results on country level, weight on country level, unit and description.
 #' @author Benjamin Leon Bodirsky
 #' @seealso
-#' \code{\link{calcNitrogenBudgetCropland}}
+#' \code{\link[mrcommons]{calcNitrogenBudgetCropland}}
 #' @examples
 #' \dontrun{
 #' calcOutput("ValidNitrogenBudgetCropland")
diff --git a/R/calcValidNitrogenBudgetPasture.R b/R/calcValidNitrogenBudgetPasture.R
index f0a20d6..4c05268 100644
--- a/R/calcValidNitrogenBudgetPasture.R
+++ b/R/calcValidNitrogenBudgetPasture.R
@@ -10,7 +10,7 @@
 #' @return List of magpie objects with results on country level, weight on country level, unit and description.
 #' @author Benjamin Leon Bodirsky
 #' @seealso
-#' \code{\link{calcNitrogenBudgetCropland}}
+#' \code{\link[mrcommons]{calcNitrogenBudgetCropland}}
 #' @examples
 #' 
 #' \dontrun{ 
diff --git a/R/calcValidPriceAgriculture.R b/R/calcValidPriceAgriculture.R
index ae6ebbf..ede6e63 100644
--- a/R/calcValidPriceAgriculture.R
+++ b/R/calcValidPriceAgriculture.R
@@ -8,7 +8,7 @@
 #' @return List with a magpie object with commodity prices on global and country level.
 #' @author Mishko Stevanovic
 #' @seealso
-#' \code{\link{readIMPACT3.2.2World_Price}}
+#' \code{\link[mrcommons]{readIMPACT3.2.2World_Price}}
 #' @examples
 #' 
 #' \dontrun{ 
diff --git a/R/calcValidProcessing.R b/R/calcValidProcessing.R
index 32b0bcf..90eced0 100644
--- a/R/calcValidProcessing.R
+++ b/R/calcValidProcessing.R
@@ -9,7 +9,7 @@
 #' @return List of magpie objects with results on country level, weight on country level, unit and description.
 #' @author David Chen, Benjamin Leon Bodirsky
 #' @seealso
-#' \code{\link{calcFoodSupplyPast}},
+#' \code{\link[mrcommons]{calcFoodSupplyPast}},
 #' \code{\link{calcValidLivestockShare}}
 #' @examples
 #' \dontrun{
diff --git a/R/calcValidProduction.R b/R/calcValidProduction.R
index 03c89bb..153ce20 100644
--- a/R/calcValidProduction.R
+++ b/R/calcValidProduction.R
@@ -8,7 +8,7 @@
 #' @return List of magpie objects with results on country level, weight on country level, unit and description.
 #' @author Benjamin Leon Bodirsky
 #' @seealso
-#' \code{\link{calcFAOmassbalance}},
+#' \code{\link[mrcommons]{calcFAOmassbalance}},
 #' \code{\link{calcValidDemand}}
 #' @examples
 #' \dontrun{
diff --git a/R/calcValidSOCDensity.R b/R/calcValidSOCDensity.R
index 26d3022..2d4f92d 100644
--- a/R/calcValidSOCDensity.R
+++ b/R/calcValidSOCDensity.R
@@ -6,7 +6,7 @@
 #' @return List of magpie objects with results on country level, weight on country level, unit and description.
 #' @author Kristine Karstens
 #' @seealso
-#' \code{\link{calcSOM}}
+#' \code{\link[mrcommons]{calcSOM}}
 #' \code{\link{calcValidSOCStocks}}
 #' @examples
 #' \dontrun{
diff --git a/R/calcValidSOCStocks.R b/R/calcValidSOCStocks.R
index 578b8eb..9ae0339 100644
--- a/R/calcValidSOCStocks.R
+++ b/R/calcValidSOCStocks.R
@@ -7,7 +7,7 @@
 #' @return List of magpie objects with results on country level, weight on country level, unit and description.
 #' @author Benjamin Leon Bodirsky, Kristine Karstens
 #' @seealso
-#' \code{\link{calcFoodSupplyPast}},
+#' \code{\link[mrcommons]{calcFoodSupplyPast}},
 #' \code{\link{calcValidLivestockShare}}
 #' @examples
 #' \dontrun{
diff --git a/R/calcValidSSPResults.R b/R/calcValidSSPResults.R
index 4a64e9e..06917e3 100644
--- a/R/calcValidSSPResults.R
+++ b/R/calcValidSSPResults.R
@@ -5,7 +5,7 @@
 #' @return List of magpie objects with results on country level, weight on country level, unit and description.
 #' @author Kristine Karstens
 #' @seealso
-#' \code{\link{convertSSPResults}}
+#' \code{\link[mrcommons]{convertSSPResults}}
 #' @examples
 #' 
 #' \dontrun{ 
diff --git a/R/calcValidSelfsuff.R b/R/calcValidSelfsuff.R
index 822877d..c06fb7f 100644
--- a/R/calcValidSelfsuff.R
+++ b/R/calcValidSelfsuff.R
@@ -18,8 +18,7 @@
 calcValidSelfsuff <- function(datasource = "FAO", detail = TRUE) {
 
   if (datasource == "FAO") {
-    kTrade <- findset("k_trade")
-    mb2 <- collapseNames(calcOutput("FAOmassbalance", aggregate = FALSE)[, , kTrade][, , "dm"])
+    mb2 <- collapseNames(calcOutput("FAOmassbalance", aggregate = FALSE)[, , "dm"])
 
     # self sufficiency
     tmp1 <- round(collapseNames(mb2[, , c("production")]), 8)
diff --git a/R/calcValidTrade.R b/R/calcValidTrade.R
index c86b336..79a644b 100644
--- a/R/calcValidTrade.R
+++ b/R/calcValidTrade.R
@@ -11,7 +11,7 @@
 #' @return List of magpie objects with results on country level, weight on country level, unit and description.
 #' @author Benjamin Leon Bodirsky, Xiaoxi Wang, David M Chen
 #' @seealso
-#' \code{\link{calcFAOmassbalance}},
+#' \code{\link[mrcommons]{calcFAOmassbalance}},
 #' \code{\link{calcValidDemand}}
 #' @examples
 #' \dontrun{
diff --git a/R/calcValidVegfruitShare.R b/R/calcValidVegfruitShare.R
index 46b0612..ac45a9e 100644
--- a/R/calcValidVegfruitShare.R
+++ b/R/calcValidVegfruitShare.R
@@ -6,7 +6,7 @@
 #' @return List of magpie objects with results on country level, weight on country level, unit and description.
 #' @author Benjamin Leon Bodirsky
 #' @seealso
-#' \code{\link{calcFoodSupplyPast}},
+#' \code{\link[mrcommons]{calcFoodSupplyPast}},
 #' \code{\link{calcValidKcal}}
 #' @examples
 #'
diff --git a/R/calcValidYield.R b/R/calcValidYield.R
index 9d5de1d..808be0b 100644
--- a/R/calcValidYield.R
+++ b/R/calcValidYield.R
@@ -18,8 +18,8 @@
 #'         Max.&Min. values alongwith description.
 #' @author Abhijeet Mishra, Isabelle Weindl, Florian Humpenoeder
 #' @seealso
-#' \code{\link{calcFAOmassbalance}},
-#' \code{\link{calcCroparea}}
+#' \code{\link[mrcommons]{calcFAOmassbalance}},
+#' \code{\link[mrlandcore]{calcCroparea}}
 #'
 #' @examples
 #' \dontrun{
diff --git a/R/convertGMIA.R b/R/convertGMIA.R
index c2a7103..a61ffa1 100644
--- a/R/convertGMIA.R
+++ b/R/convertGMIA.R
@@ -10,7 +10,7 @@
 #' @return Global Map on Irrigation data as MAgPIE object on country level Missing values are added as NA
 #'
 #' @author Stephen Wirth
-#' @seealso \code{\link{readSource}}
+#' @seealso \code{\link[madrat]{readSource}}
 #' @examples
 #' \dontrun{
 #' a <- readSource("GlobalIrrigationMap", "all_data_national")
diff --git a/R/convertGasser.R b/R/convertGasser.R
index 0c44962..64c944e 100644
--- a/R/convertGasser.R
+++ b/R/convertGasser.R
@@ -8,7 +8,7 @@
 #' @param x MAgPIE object containing Gasser emissions data
 #' @return Historical LUC emission data
 #' @author Abhijeet Mishra
-#' @seealso \code{\link{readSource}}
+#' @seealso \code{\link[madrat]{readSource}}
 #' 
 #' @importFrom madrat toolCountryFill
 
diff --git a/R/convertHID.R b/R/convertHID.R
index 9d3e429..c20e091 100644
--- a/R/convertHID.R
+++ b/R/convertHID.R
@@ -9,7 +9,7 @@
 #' @param subtype : No subtype needed
 #' @return Irrigated Area data as MAgPIE object on country level Missing values are added as NA
 #' @author Stephen Wirth
-#' @seealso \code{\link{readSource}}
+#' @seealso \code{\link[madrat]{readSource}}
 #' @importFrom madrat getISOlist
 #' @examples
 #' 
diff --git a/R/convertIMPACTIrrigInvCosts.R b/R/convertIMPACTIrrigInvCosts.R
index 42467fd..a131e10 100644
--- a/R/convertIMPACTIrrigInvCosts.R
+++ b/R/convertIMPACTIrrigInvCosts.R
@@ -10,7 +10,7 @@
 #'
 #' @author Felicitas Beier
 #'
-#' @seealso \code{\link{readSource}}
+#' @seealso \code{\link[madrat]{readSource}}
 #' @examples
 #' \dontrun{
 #' a <- readSource("IMPACTIrrigInvCosts", convert = TRUE)
diff --git a/R/convertPardeyAgRD.R b/R/convertPardeyAgRD.R
index 7878564..22ad205 100644
--- a/R/convertPardeyAgRD.R
+++ b/R/convertPardeyAgRD.R
@@ -5,7 +5,7 @@
 #' @param x MAgPIE object containing PardeyRD data
 #' @return magpie object containing expenditure in Ag R&D, 2009 USD PPP
 #' @author David Chen
-#' @seealso \code{\link{readSource}}
+#' @seealso \code{\link[madrat]{readSource}}
 #' @examples
 #'
 #' \dontrun{
diff --git a/R/convertWaterUsage.R b/R/convertWaterUsage.R
index b9aee1d..f470f6c 100644
--- a/R/convertWaterUsage.R
+++ b/R/convertWaterUsage.R
@@ -6,7 +6,7 @@
 #' @param subtype : No subtype needed
 #' @return Data on water use as MAgPIE object on country level Missing values are added as NA
 #' @author Stephen Wirth
-#' @seealso \code{\link{readSource}}
+#' @seealso \code{\link[madrat]{readSource}}
 #' @examples
 #' \dontrun{
 #' a <- readSource("WaterUsage", "aquastat_2008_12")
diff --git a/R/correctGMIA.R b/R/correctGMIA.R
index a2ec7de..593313c 100644
--- a/R/correctGMIA.R
+++ b/R/correctGMIA.R
@@ -9,7 +9,7 @@
 #' @param subtype : subtypes are the same as in readGMIA
 #' @return Global Map on Irrigation data as MAgPIE object at a 0.5 Degree resolution.
 #' @author Stephen Wirth
-#' @seealso \code{\link{readSource}}
+#' @seealso \code{\link[madrat]{readSource}}
 #' @examples
 #' \dontrun{
 #' a <- readSource("IrrigatedArea")
diff --git a/R/correctHID.R b/R/correctHID.R
index 1dccb15..0d57aae 100644
--- a/R/correctHID.R
+++ b/R/correctHID.R
@@ -9,7 +9,7 @@
 #' @param subtype : subtypes are the same as in readGMIA
 #' @return Global Map on Irrigation data as MAgPIE object at a 0.5 Degree resolution.
 #' @author Stephen Wirth
-#' @seealso \code{\link{readSource}}
+#' @seealso \code{\link[madrat]{readSource}}
 #' @examples
 #' \dontrun{
 #' a <- readSource("IrrigatedArea")
diff --git a/R/fullVALIDATION.R b/R/fullVALIDATION.R
index 551bf95..b1071c3 100644
--- a/R/fullVALIDATION.R
+++ b/R/fullVALIDATION.R
@@ -6,7 +6,7 @@
 #' \code{\link[base]{numeric_version}} when called via \code{\link[madrat]{retrieveData}}.
 #' @author Jan Philipp Dietrich, Benjamin Leon Bodirsky
 #' @seealso
-#' \code{\link{readSource}},\code{\link{getCalculations}},\code{\link{calcOutput}}
+#' \code{\link[madrat]{readSource}},\code{\link[madrat]{getCalculations}},\code{\link[madrat]{calcOutput}}
 #' @examples
 #' \dontrun{
 #' retrieveData("Validation")
@@ -211,10 +211,6 @@ fullVALIDATION <- function(rev = 0.1) {
   # Carbon Stocks
   calcOutput("ValidCarbon", datasource = "LPJmL4_for_MAgPIE_44ac93de:GSWP3-W5E5:historical", aggregate = "REG+GLO",
              file = valfile, append = TRUE, try = TRUE)
-  # calcOutput("ValidGrassSoilCarbon", datasource = "ISIMIP3b:IPSL-CM6A-LR:ssp126:1965-2100", model = "c7491e",
-  #           lpjml = "lpjml5p2_pasture", aggregate = FALSE, file = valfile, append = TRUE, try = TRUE)
-  # Temporaraly swiched off for debugging
-
 
   # Growing Stocks
   calcOutput("ValidGS", datasource = "FAO", aggregate = "REG+GLO", indicator = "relative",
diff --git a/R/readEmisLucGlo.R b/R/readEmisLucGlo.R
index 20a59ad..b13d612 100644
--- a/R/readEmisLucGlo.R
+++ b/R/readEmisLucGlo.R
@@ -15,7 +15,7 @@
 #'  }
 #' @return magpie object containing data land-use change CO2 emissions
 #' @author Florian Humpenoeder
-#' @seealso \code{\link{readSource}}
+#' @seealso \code{\link[madrat]{readSource}}
 #' @examples
 #' 
 #' \dontrun{ 
diff --git a/R/readFAOrotation.R b/R/readFAOrotation.R
index f09a1bb..07a603e 100644
--- a/R/readFAOrotation.R
+++ b/R/readFAOrotation.R
@@ -4,7 +4,7 @@
 #' @param subtype subtype - only FAO supported
 #' @return magpie object containing rotation length data
 #' @author Abhijeet Mishra
-#' @seealso \code{\link{readSource}}
+#' @seealso \code{\link[madrat]{readSource}}
 #' @examples
 #' \dontrun{
 #' a <- readSource("FAOrotation")
diff --git a/R/readGMIA.R b/R/readGMIA.R
index be643fb..4e13098 100644
--- a/R/readGMIA.R
+++ b/R/readGMIA.R
@@ -36,7 +36,7 @@
 #' }
 #' @return magpie object of the Irrigated Area  data
 #' @author Stephen Wirth
-#' @seealso \code{\link{readSource}}
+#' @seealso \code{\link[madrat]{readSource}}
 #' @examples
 #' \dontrun{
 #' a <- readSource("GlobalIrrigationMap", "all_data_national")
diff --git a/R/readGasser.R b/R/readGasser.R
index 9ff8230..51505cf 100644
--- a/R/readGasser.R
+++ b/R/readGasser.R
@@ -4,7 +4,7 @@
 #' @param subtype subtype
 #' @return magpie object containing data land-use change CARBON emissions
 #' @author Abhijeet Mishra
-#' @seealso \code{\link{readSource}}
+#' @seealso \code{\link[madrat]{readSource}}
 #' @examples
 #' \dontrun{
 #' a <- readSource("Gasser")
diff --git a/R/readHID.R b/R/readHID.R
index 878f991..6f68972 100644
--- a/R/readHID.R
+++ b/R/readHID.R
@@ -28,7 +28,7 @@
 #'  }
 #' @return magpie object of the Irrigated Area  data
 #' @author Stephen Wirth
-#' @seealso \code{\link{readSource}}
+#' @seealso \code{\link[madrat]{readSource}}
 #' @examples
 #' \dontrun{ 
 #' a <- readSource("HID", "national_1900_2005")
diff --git a/R/readIMPACTIrrigInvCosts.R b/R/readIMPACTIrrigInvCosts.R
index dc62adf..c8ab559 100644
--- a/R/readIMPACTIrrigInvCosts.R
+++ b/R/readIMPACTIrrigInvCosts.R
@@ -9,7 +9,7 @@
 #'
 #' @author Felicitas Beier
 #'
-#' @seealso \code{\link{readSource}}
+#' @seealso \code{\link[madrat]{readSource}}
 #' @examples
 #' \dontrun{
 #' a <- readSource("IMPACTIrrigInvCosts", convert = TRUE)
diff --git a/R/readPardeyAgRD.R b/R/readPardeyAgRD.R
index 81c0f02..f9398a1 100644
--- a/R/readPardeyAgRD.R
+++ b/R/readPardeyAgRD.R
@@ -7,7 +7,7 @@
 #' but more years
 #' @return magpie object containing expenditure in Ag R&D, 2009 USD PPP
 #' @author David Chen
-#' @seealso \code{\link{readSource}}
+#' @seealso \code{\link[madrat]{readSource}}
 #' @examples
 #' \dontrun{
 #' a <- readSource("PardeyAgRD")
diff --git a/R/readProdPrIndex.R b/R/readProdPrIndex.R
index b86801b..e00d388 100644
--- a/R/readProdPrIndex.R
+++ b/R/readProdPrIndex.R
@@ -5,7 +5,7 @@
 #' 
 #' @return magpie object of the world producer index from FAO
 #' @author Mishko Stevanovic
-#' @seealso \code{\link{readSource}}
+#' @seealso \code{\link[madrat]{readSource}}
 #' @examples
 #' 
 #' \dontrun{ a <- readSource(type="ProdPrIndex")
diff --git a/R/readWaterUsage.R b/R/readWaterUsage.R
index 3d672de..22724da 100644
--- a/R/readWaterUsage.R
+++ b/R/readWaterUsage.R
@@ -23,7 +23,7 @@
 #'  }
 #' @return magpie object containing data on water usage
 #' @author Stephen Wirth
-#' @seealso \code{\link{readSource}}
+#' @seealso \code{\link[madrat]{readSource}}
 #' @examples
 #' \dontrun{
 #' a <- readSource("foley_2011")
diff --git a/README.md b/README.md
index 2ca8e1b..944214b 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # madrat data preparation for validation purposes
 
-R package **mrvalidation**, version **2.61.30**
+R package **mrvalidation**, version **2.61.33**
 
 [![CRAN status](https://www.r-pkg.org/badges/version/mrvalidation)](https://cran.r-project.org/package=mrvalidation) [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.4317826.svg)](https://doi.org/10.5281/zenodo.4317826) [![R build status](https://github.com/pik-piam/mrvalidation/workflows/check/badge.svg)](https://github.com/pik-piam/mrvalidation/actions) [![codecov](https://codecov.io/gh/pik-piam/mrvalidation/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/mrvalidation) [![r-universe](https://pik-piam.r-universe.dev/badges/mrvalidation)](https://pik-piam.r-universe.dev/builds)
 
@@ -39,7 +39,7 @@ In case of questions / problems please contact Benjamin Leon Bodirsky <bodirsky@
 
 To cite package **mrvalidation** in publications use:
 
-Bodirsky B, Wirth S, Karstens K, Humpenoeder F, Stevanovic M, Mishra A, Biewald A, Weindl I, Beier F, Chen D, Crawford M, Leip D, Molina Bacca E, Kreidenweis U, W. Yalew A, von Jeetze P, Wang X, Dietrich J, Alves M (2025). "mrvalidation: madrat data preparation for validation purposes." doi:10.5281/zenodo.4317826 <https://doi.org/10.5281/zenodo.4317826>, Version: 2.61.30, <https://github.com/pik-piam/mrvalidation>.
+Bodirsky B, Wirth S, Karstens K, Humpenoeder F, Stevanovic M, Mishra A, Biewald A, Weindl I, Beier F, Chen D, Crawford M, Leip D, Molina Bacca E, Kreidenweis U, W. Yalew A, von Jeetze P, Wang X, Dietrich J, Alves M (2025). "mrvalidation: madrat data preparation for validation purposes." doi:10.5281/zenodo.4317826 <https://doi.org/10.5281/zenodo.4317826>, Version: 2.61.33, <https://github.com/pik-piam/mrvalidation>.
 
 A BibTeX entry for LaTeX users is
 
@@ -48,9 +48,9 @@ A BibTeX entry for LaTeX users is
   title = {mrvalidation: madrat data preparation for validation purposes},
   author = {Benjamin Leon Bodirsky and Stephen Wirth and Kristine Karstens and Florian Humpenoeder and Mishko Stevanovic and Abhijeet Mishra and Anne Biewald and Isabelle Weindl and Felicitas Beier and David Chen and Michael Crawford and Debbora Leip and Edna {Molina Bacca} and Ulrich Kreidenweis and Amsalu {W. Yalew} and Patrick {von Jeetze} and Xiaoxi Wang and Jan Philipp Dietrich and Marcos Alves},
   doi = {10.5281/zenodo.4317826},
-  date = {2025-05-05},
+  date = {2025-08-11},
   year = {2025},
   url = {https://github.com/pik-piam/mrvalidation},
-  note = {Version: 2.61.30},
+  note = {Version: 2.61.33},
 }
 ```
diff --git a/man/calcNitrogenSurplusByCrop.Rd b/man/calcNitrogenSurplusByCrop.Rd
index a027e0b..8be4295 100644
--- a/man/calcNitrogenSurplusByCrop.Rd
+++ b/man/calcNitrogenSurplusByCrop.Rd
@@ -30,7 +30,7 @@ calcOutput("NitrogenSurplusByCrop")
 }
 }
 \seealso{
-\code{\link{calcNitrogenBudgetCropland}}
+\code{\link[mrcommons]{calcNitrogenBudgetCropland}}
 }
 \author{
 Benjamin Leon Bodirsky
diff --git a/man/calcValidDemand.Rd b/man/calcValidDemand.Rd
index d644c20..8770bca 100644
--- a/man/calcValidDemand.Rd
+++ b/man/calcValidDemand.Rd
@@ -28,7 +28,7 @@ calcOutput("ValidDemand")
 
 }
 \seealso{
-\code{\link{calcFoodSupplyPast}},
+\code{\link[mrcommons]{calcFoodSupplyPast}},
 \code{\link{calcValidLivestockShare}}
 }
 \author{
diff --git a/man/calcValidFeed.Rd b/man/calcValidFeed.Rd
index 11a31b8..7021119 100644
--- a/man/calcValidFeed.Rd
+++ b/man/calcValidFeed.Rd
@@ -26,8 +26,8 @@ calcOutput("ValidFeed")
 
 }
 \seealso{
-\code{\link{calcFoodSupplyPast}},
-\code{\link{calcValidLivestockShare}}
+\code{\link[mrcommons]{calcFoodSupplyPast}},
+\code{\link[mrvalidation]{calcValidLivestockShare}}
 }
 \author{
 Benjamin Leon Bodirsky
diff --git a/man/calcValidFeedConversion.Rd b/man/calcValidFeedConversion.Rd
index 6b382ca..afe9bb3 100644
--- a/man/calcValidFeedConversion.Rd
+++ b/man/calcValidFeedConversion.Rd
@@ -25,7 +25,7 @@ calcOutput("ValidFeed")
 
 }
 \seealso{
-\code{\link{calcFoodSupplyPast}},
+\code{\link[mrcommons]{calcFoodSupplyPast}},
 \code{\link{calcValidLivestockShare}}
 }
 \author{
diff --git a/man/calcValidGrassLSUha.Rd b/man/calcValidGrassLSUha.Rd
index 0bb3f07..17c8b9d 100644
--- a/man/calcValidGrassLSUha.Rd
+++ b/man/calcValidGrassLSUha.Rd
@@ -21,7 +21,7 @@ calcOutput("ValidGrassLSUha")
 }
 }
 \seealso{
-\code{\link{calcFAOmassbalance}},
+\code{\link[mrcommons]{calcFAOmassbalance}},
 }
 \author{
 Marcos Alves
diff --git a/man/calcValidGrassSoilCarbon.Rd b/man/calcValidGrassSoilCarbon.Rd
deleted file mode 100644
index cbc30ad..0000000
--- a/man/calcValidGrassSoilCarbon.Rd
+++ /dev/null
@@ -1,33 +0,0 @@
-% Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/calcValidGrassSoilCarbon.R
-\name{calcValidGrassSoilCarbon}
-\alias{calcValidGrassSoilCarbon}
-\title{calcValidGrassSoilCarbon}
-\usage{
-calcValidGrassSoilCarbon(
-  datasource = "ISIMIP3b:IPSL-CM6A-LR:ssp126:1965-2100",
-  model = "9eaf9b",
-  lpjml
-)
-}
-\arguments{
-\item{datasource}{Datasources for validation data}
-
-\item{model}{trained model ID}
-
-\item{lpjml}{lpjml version}
-}
-\value{
-List of magpie objects with results on country level, weight on country level, unit and description.
-}
-\description{
-calculates the validation data for grasslands
-}
-\examples{
-\dontrun{
-calcOutput("ValidGrassSoilCarbon")
-}
-}
-\author{
-Marcos Alves
-}
diff --git a/man/calcValidKcal.Rd b/man/calcValidKcal.Rd
index edfb60b..1fae92b 100644
--- a/man/calcValidKcal.Rd
+++ b/man/calcValidKcal.Rd
@@ -28,7 +28,7 @@ calcOutput("ValidKcal")
 
 }
 \seealso{
-\code{\link{calcFoodSupplyPast}},
+\code{\link[mrcommons]{calcFoodSupplyPast}},
 \code{\link{calcValidLivestockShare}}
 }
 \author{
diff --git a/man/calcValidLivestockDemStructure.Rd b/man/calcValidLivestockDemStructure.Rd
index 0bebcd3..380aa23 100644
--- a/man/calcValidLivestockDemStructure.Rd
+++ b/man/calcValidLivestockDemStructure.Rd
@@ -23,7 +23,7 @@ calcOutput("ValidLivestockDemStructure")
 
 }
 \seealso{
-\code{\link{calcFoodSupplyPast}},
+\code{\link[mrcommons]{calcFoodSupplyPast}},
 \code{\link{calcValidLivestockShare}}
 }
 \author{
diff --git a/man/calcValidLivestockShare.Rd b/man/calcValidLivestockShare.Rd
index 7a73fa4..a6a01d9 100644
--- a/man/calcValidLivestockShare.Rd
+++ b/man/calcValidLivestockShare.Rd
@@ -23,7 +23,7 @@ calcOutput("ValidLivestockShare")
 
 }
 \seealso{
-\code{\link{calcFoodSupplyPast}},
+\code{\link[mrcommons]{calcFoodSupplyPast}},
 \code{\link{calcValidKcal}}
 }
 \author{
diff --git a/man/calcValidManure.Rd b/man/calcValidManure.Rd
index 9008eab..f7ca5e4 100644
--- a/man/calcValidManure.Rd
+++ b/man/calcValidManure.Rd
@@ -23,8 +23,8 @@ calcOutput("ValidManure")
 
 }
 \seealso{
-\code{\link{calcExcretion}},
-\code{\link{calcExcretionIPCC}}
+\code{\link[mrcommons]{calcExcretion}},
+\code{\link[mrcommons]{calcExcretionIPCC}}
 }
 \author{
 Benjamin Leon Bodirsky
diff --git a/man/calcValidNitrogenBudgetCropland.Rd b/man/calcValidNitrogenBudgetCropland.Rd
index 086ecea..1092a6e 100644
--- a/man/calcValidNitrogenBudgetCropland.Rd
+++ b/man/calcValidNitrogenBudgetCropland.Rd
@@ -27,7 +27,7 @@ calcOutput("ValidNitrogenBudgetCropland")
 
 }
 \seealso{
-\code{\link{calcNitrogenBudgetCropland}}
+\code{\link[mrcommons]{calcNitrogenBudgetCropland}}
 }
 \author{
 Benjamin Leon Bodirsky
diff --git a/man/calcValidNitrogenBudgetPasture.Rd b/man/calcValidNitrogenBudgetPasture.Rd
index cb0ff51..2edba01 100644
--- a/man/calcValidNitrogenBudgetPasture.Rd
+++ b/man/calcValidNitrogenBudgetPasture.Rd
@@ -27,7 +27,7 @@ calcOutput("ValidNitrogenBudgetPasture")
 
 }
 \seealso{
-\code{\link{calcNitrogenBudgetCropland}}
+\code{\link[mrcommons]{calcNitrogenBudgetCropland}}
 }
 \author{
 Benjamin Leon Bodirsky
diff --git a/man/calcValidPriceAgriculture.Rd b/man/calcValidPriceAgriculture.Rd
index 5b3b9ab..6032f52 100644
--- a/man/calcValidPriceAgriculture.Rd
+++ b/man/calcValidPriceAgriculture.Rd
@@ -25,7 +25,7 @@ calcOutput("ValidPriceAgriculture", datasource="FAO")
 
 }
 \seealso{
-\code{\link{readIMPACT3.2.2World_Price}}
+\code{\link[mrcommons]{readIMPACT3.2.2World_Price}}
 }
 \author{
 Mishko Stevanovic
diff --git a/man/calcValidProcessing.Rd b/man/calcValidProcessing.Rd
index 767370d..95e4753 100644
--- a/man/calcValidProcessing.Rd
+++ b/man/calcValidProcessing.Rd
@@ -35,7 +35,7 @@ calcOutput("ValidProcessing", indicator = "secondary_from_primary")
 
 }
 \seealso{
-\code{\link{calcFoodSupplyPast}},
+\code{\link[mrcommons]{calcFoodSupplyPast}},
 \code{\link{calcValidLivestockShare}}
 }
 \author{
diff --git a/man/calcValidProduction.Rd b/man/calcValidProduction.Rd
index 9802407..6e47501 100644
--- a/man/calcValidProduction.Rd
+++ b/man/calcValidProduction.Rd
@@ -26,7 +26,7 @@ calcOutput("ValidProduction")
 
 }
 \seealso{
-\code{\link{calcFAOmassbalance}},
+\code{\link[mrcommons]{calcFAOmassbalance}},
 \code{\link{calcValidDemand}}
 }
 \author{
diff --git a/man/calcValidSOCDensity.Rd b/man/calcValidSOCDensity.Rd
index f126bbf..887daaf 100644
--- a/man/calcValidSOCDensity.Rd
+++ b/man/calcValidSOCDensity.Rd
@@ -22,7 +22,7 @@ calcOutput("ValidSOCDensity")
 
 }
 \seealso{
-\code{\link{calcSOM}}
+\code{\link[mrcommons]{calcSOM}}
 \code{\link{calcValidSOCStocks}}
 }
 \author{
diff --git a/man/calcValidSOCStocks.Rd b/man/calcValidSOCStocks.Rd
index 20c494a..9131430 100644
--- a/man/calcValidSOCStocks.Rd
+++ b/man/calcValidSOCStocks.Rd
@@ -24,7 +24,7 @@ calcOutput("ValidSOCStocks")
 
 }
 \seealso{
-\code{\link{calcFoodSupplyPast}},
+\code{\link[mrcommons]{calcFoodSupplyPast}},
 \code{\link{calcValidLivestockShare}}
 }
 \author{
diff --git a/man/calcValidSSPResults.Rd b/man/calcValidSSPResults.Rd
index 26cbeb0..f110fcc 100644
--- a/man/calcValidSSPResults.Rd
+++ b/man/calcValidSSPResults.Rd
@@ -20,7 +20,7 @@ Convert SSPResults to reporting format
 
 }
 \seealso{
-\code{\link{convertSSPResults}}
+\code{\link[mrcommons]{convertSSPResults}}
 }
 \author{
 Kristine Karstens
diff --git a/man/calcValidTrade.Rd b/man/calcValidTrade.Rd
index 3a415a8..a2e9e6b 100644
--- a/man/calcValidTrade.Rd
+++ b/man/calcValidTrade.Rd
@@ -37,7 +37,7 @@ calcOutput("ValidTrade")
 
 }
 \seealso{
-\code{\link{calcFAOmassbalance}},
+\code{\link[mrcommons]{calcFAOmassbalance}},
 \code{\link{calcValidDemand}}
 }
 \author{
diff --git a/man/calcValidVegfruitShare.Rd b/man/calcValidVegfruitShare.Rd
index 913cffc..40a2034 100644
--- a/man/calcValidVegfruitShare.Rd
+++ b/man/calcValidVegfruitShare.Rd
@@ -23,7 +23,7 @@ calcOutput("ValidVegfruitShare")
 
 }
 \seealso{
-\code{\link{calcFoodSupplyPast}},
+\code{\link[mrcommons]{calcFoodSupplyPast}},
 \code{\link{calcValidKcal}}
 }
 \author{
diff --git a/man/calcValidYield.Rd b/man/calcValidYield.Rd
index 00a6861..b99ce70 100644
--- a/man/calcValidYield.Rd
+++ b/man/calcValidYield.Rd
@@ -34,8 +34,8 @@ calcOutput("ValidYield")
 }
 }
 \seealso{
-\code{\link{calcFAOmassbalance}},
-\code{\link{calcCroparea}}
+\code{\link[mrcommons]{calcFAOmassbalance}},
+\code{\link[mrlandcore]{calcCroparea}}
 }
 \author{
 Abhijeet Mishra, Isabelle Weindl, Florian Humpenoeder
diff --git a/man/convertGMIA.Rd b/man/convertGMIA.Rd
index 0d0d659..c770f09 100644
--- a/man/convertGMIA.Rd
+++ b/man/convertGMIA.Rd
@@ -27,7 +27,7 @@ a <- readSource ("GMIA", "aei_pct", convert = "correctonly")
 }
 }
 \seealso{
-\code{\link{readSource}}
+\code{\link[madrat]{readSource}}
 }
 \author{
 Stephen Wirth
diff --git a/man/convertGasser.Rd b/man/convertGasser.Rd
index e8ab193..ba4d9e0 100644
--- a/man/convertGasser.Rd
+++ b/man/convertGasser.Rd
@@ -19,7 +19,7 @@ Convert subtypes on ISO country level.
 Convert Gasser Data
 }
 \seealso{
-\code{\link{readSource}}
+\code{\link[madrat]{readSource}}
 }
 \author{
 Abhijeet Mishra
diff --git a/man/convertHID.Rd b/man/convertHID.Rd
index 4f4a227..41bf093 100644
--- a/man/convertHID.Rd
+++ b/man/convertHID.Rd
@@ -28,7 +28,7 @@ a <- readSource("HID", "national_1900_2005")
 
 }
 \seealso{
-\code{\link{readSource}}
+\code{\link[madrat]{readSource}}
 }
 \author{
 Stephen Wirth
diff --git a/man/convertIMPACTIrrigInvCosts.Rd b/man/convertIMPACTIrrigInvCosts.Rd
index ea757bc..d7f0669 100644
--- a/man/convertIMPACTIrrigInvCosts.Rd
+++ b/man/convertIMPACTIrrigInvCosts.Rd
@@ -25,7 +25,7 @@ a <- readSource("IMPACTIrrigInvCosts", convert = TRUE)
 
 }
 \seealso{
-\code{\link{readSource}}
+\code{\link[madrat]{readSource}}
 }
 \author{
 Felicitas Beier
diff --git a/man/convertPardeyAgRD.Rd b/man/convertPardeyAgRD.Rd
index 43c6471..f1b25eb 100644
--- a/man/convertPardeyAgRD.Rd
+++ b/man/convertPardeyAgRD.Rd
@@ -24,7 +24,7 @@ a <- convertSource("PardeyAgRD")
 }
 }
 \seealso{
-\code{\link{readSource}}
+\code{\link[madrat]{readSource}}
 }
 \author{
 David Chen
diff --git a/man/convertWaterUsage.Rd b/man/convertWaterUsage.Rd
index a31200a..05335e7 100644
--- a/man/convertWaterUsage.Rd
+++ b/man/convertWaterUsage.Rd
@@ -25,7 +25,7 @@ a <- readSource("WaterUsage", "aquastat_2008_12")
 
 }
 \seealso{
-\code{\link{readSource}}
+\code{\link[madrat]{readSource}}
 }
 \author{
 Stephen Wirth
diff --git a/man/correctGMIA.Rd b/man/correctGMIA.Rd
index 668f7d5..e33905c 100644
--- a/man/correctGMIA.Rd
+++ b/man/correctGMIA.Rd
@@ -27,7 +27,7 @@ a <- readSource("IrrigatedArea")
 }
 }
 \seealso{
-\code{\link{readSource}}
+\code{\link[madrat]{readSource}}
 }
 \author{
 Stephen Wirth
diff --git a/man/correctHID.Rd b/man/correctHID.Rd
index 9f66b5c..07c8129 100644
--- a/man/correctHID.Rd
+++ b/man/correctHID.Rd
@@ -27,7 +27,7 @@ a <- readSource("IrrigatedArea")
 }
 }
 \seealso{
-\code{\link{readSource}}
+\code{\link[madrat]{readSource}}
 }
 \author{
 Stephen Wirth
diff --git a/man/fullVALIDATION.Rd b/man/fullVALIDATION.Rd
index 65b166d..2396a53 100644
--- a/man/fullVALIDATION.Rd
+++ b/man/fullVALIDATION.Rd
@@ -20,7 +20,7 @@ retrieveData("Validation")
 
 }
 \seealso{
-\code{\link{readSource}},\code{\link{getCalculations}},\code{\link{calcOutput}}
+\code{\link[madrat]{readSource}},\code{\link[madrat]{getCalculations}},\code{\link[madrat]{calcOutput}}
 }
 \author{
 Jan Philipp Dietrich, Benjamin Leon Bodirsky
diff --git a/man/readEmisLucGlo.Rd b/man/readEmisLucGlo.Rd
index f615182..e7db4c3 100644
--- a/man/readEmisLucGlo.Rd
+++ b/man/readEmisLucGlo.Rd
@@ -34,7 +34,7 @@ a <- readSource("EmisLucGlo",subtype="Friedlingstein_2010")
 #'@importFrom reshape2 dcast
 }
 \seealso{
-\code{\link{readSource}}
+\code{\link[madrat]{readSource}}
 }
 \author{
 Florian Humpenoeder
diff --git a/man/readFAOrotation.Rd b/man/readFAOrotation.Rd
index 4cae107..ef3262f 100644
--- a/man/readFAOrotation.Rd
+++ b/man/readFAOrotation.Rd
@@ -21,7 +21,7 @@ a <- readSource("FAOrotation")
 }
 }
 \seealso{
-\code{\link{readSource}}
+\code{\link[madrat]{readSource}}
 }
 \author{
 Abhijeet Mishra
diff --git a/man/readGMIA.Rd b/man/readGMIA.Rd
index eb52d63..82d820c 100644
--- a/man/readGMIA.Rd
+++ b/man/readGMIA.Rd
@@ -54,7 +54,7 @@ a <- readSource ("GMIA", "aei_pct", convert = "correctonly")
 
 }
 \seealso{
-\code{\link{readSource}}
+\code{\link[madrat]{readSource}}
 }
 \author{
 Stephen Wirth
diff --git a/man/readGasser.Rd b/man/readGasser.Rd
index f0ccad8..a8b09a5 100644
--- a/man/readGasser.Rd
+++ b/man/readGasser.Rd
@@ -21,7 +21,7 @@ a <- readSource("Gasser")
 }
 }
 \seealso{
-\code{\link{readSource}}
+\code{\link[madrat]{readSource}}
 }
 \author{
 Abhijeet Mishra
diff --git a/man/readHID.Rd b/man/readHID.Rd
index 1288308..5f9dd3a 100644
--- a/man/readHID.Rd
+++ b/man/readHID.Rd
@@ -44,7 +44,7 @@ a <- readSource("HID", "national_1900_2005")
 }
 }
 \seealso{
-\code{\link{readSource}}
+\code{\link[madrat]{readSource}}
 }
 \author{
 Stephen Wirth
diff --git a/man/readIMPACTIrrigInvCosts.Rd b/man/readIMPACTIrrigInvCosts.Rd
index c1ae070..7d84b1c 100644
--- a/man/readIMPACTIrrigInvCosts.Rd
+++ b/man/readIMPACTIrrigInvCosts.Rd
@@ -23,7 +23,7 @@ a <- readSource("IMPACTIrrigInvCosts", convert = TRUE)
 
 }
 \seealso{
-\code{\link{readSource}}
+\code{\link[madrat]{readSource}}
 }
 \author{
 Felicitas Beier
diff --git a/man/readPardeyAgRD.Rd b/man/readPardeyAgRD.Rd
index 6bd4886..0db4e69 100644
--- a/man/readPardeyAgRD.Rd
+++ b/man/readPardeyAgRD.Rd
@@ -23,7 +23,7 @@ a <- readSource("PardeyAgRD")
 }
 }
 \seealso{
-\code{\link{readSource}}
+\code{\link[madrat]{readSource}}
 }
 \author{
 David Chen
diff --git a/man/readProdPrIndex.Rd b/man/readProdPrIndex.Rd
index 53e2c5a..5258a90 100644
--- a/man/readProdPrIndex.Rd
+++ b/man/readProdPrIndex.Rd
@@ -19,7 +19,7 @@ Read-in world producer price index as magclass object
 
 }
 \seealso{
-\code{\link{readSource}}
+\code{\link[madrat]{readSource}}
 }
 \author{
 Mishko Stevanovic
diff --git a/man/readWaterUsage.Rd b/man/readWaterUsage.Rd
index 3b2f63c..cca33a9 100644
--- a/man/readWaterUsage.Rd
+++ b/man/readWaterUsage.Rd
@@ -41,7 +41,7 @@ a <- readSource("aquastat_2008_12")
 #' @importFrom reshape2 dcast
 }
 \seealso{
-\code{\link{readSource}}
+\code{\link[madrat]{readSource}}
 }
 \author{
 Stephen Wirth