diff --git a/R/HelperFunctions.R b/R/HelperFunctions.R
index cba4674193458d4aea65e81f9e2207a109949fc9..9420f1899348f74bff58859c02e8bf02d6083e1e 100644
--- a/R/HelperFunctions.R
+++ b/R/HelperFunctions.R
@@ -16,7 +16,7 @@ NULL
 #' @export
 PaymentTimeEnum = objectProperties::setSingleEnum("PaymentTime", levels = c("in advance", "in arrears"));
 
-#' Enum to describe possble sexes in an insurance contract or tariff.
+#' Enum to describe possible sexes in an insurance contract or tariff.
 #' @details
 #' Currently, only possible values are allowed;
 #' * "unisex"
diff --git a/R/InsuranceContract.R b/R/InsuranceContract.R
index c748c203b16f5ea1bc313a06d3f6e6f86b7b2c3d..29427506a705f2cccf4c76c726adae30493e4146 100644
--- a/R/InsuranceContract.R
+++ b/R/InsuranceContract.R
@@ -16,10 +16,11 @@ NULL
 #'
 #' # Usage
 #'
-#' The typical usage of this class is to simply call [InsuranceContract$new()].
+#' The typical usage of this class is to simply call
+#' \ifelse{html}{\href{#method-new}{\code{InsuranceContract$new()}}}{\code{InsuranceContract$new()()}}.
 #'
 #' All parameters from the [InsuranceContract.ParameterDefaults] can be passed
-#' to the constructor of the class (i.e. the [InsuranceContract$new()]-call).
+#' to the constructor of the class (i.e. the \ifelse{html}{\href{#method-new}{\code{InsuranceContract$new()}}}{\code{InsuranceContract$new()()}}-call).
 #' Parameters not explicitly given, will be taken from the tariff or as a fall-back
 #' mechanism from the [InsuranceContract.ParameterDefaults] defaults.
 #'
@@ -31,7 +32,7 @@ NULL
 #' # Calculation approach: Valuation
 #'
 #' The calculation of all contract values is controlled by the function
-#' [InsuranceContract$calculateContract()] (using methods of the [InsuranceTarif]
+#' \ifelse{html}{\href{method-calculateContract}{\code{InsuranceContract$calculateContract()}}}{\code{InsuranceContract$calculateContract()()}} (using methods of the [InsuranceTarif]
 #' object) and follows the following logic:
 #'
 #' 1. First the **contingent (unit) cash flows** and the **transition probbilities**
@@ -71,7 +72,10 @@ NULL
 #' included, the corresponding [ProfitParticipation] object can calculate that
 #' profit sharing amounts, once all guaranteed values are calculated. This can
 #' also be triggered manually (with custom profit sharing rates) by calling
-#' the methods [InsuranceContract$profitScenario()] or [InsuranceContract$addProfitScenario()].
+#' the methods \ifelse{html}{\href{#method-profitScenario}{\code{InsuranceContract$profitScenario()}}}{\code{InsuranceContract$profitScenario()()}}]
+#' or \ifelse{html}{\href{#method-addProfitScenario}{\code{InsuranceContract$addProfitScenario()}}}{\code{InsuranceContract$addProfitScenario()()}}.
+#'
+#'
 #'
 #'
 #' # Calculation approach: Cash Flows
@@ -248,13 +252,13 @@ InsuranceContract = R6Class(
         #'        parameter is used internally, but should not be used in
         #'        user-written code.
         #' @param calculate how much of the contract's time series need to be
-        #'        calculated. See [CalculateEnum] for all possible values. This
+        #'        calculated. See [CalculationEnum] for all possible values. This
         #'        is usefull to prevent calculation of e.g. reserves and profit
         #'        participation, when one only wants to create a grid of premiums.
         #' @param profitid The ID of the default profit participation scenario.
         #'        The default profit participation scenario uses the default
         #'        values passed, while further scenarios can be added by
-        #'        [InsuranceContract$addProfitScenario()].
+        #'        \ifelse{html}{\href{#method-addProfitScenario}{\code{InsuranceContract$addProfitScenario()}}}{\code{InsuranceContract$addProfitScenario()()}}.
         #' @param ... Further parameters (age, sum insured, contract closing /
         #'        begin, premium payment details, etc.) of the contract, which
         #'        can also override parameters defined at the tariff-level.
@@ -363,7 +367,7 @@ InsuranceContract = R6Class(
         #'        the child's values need to be translated to the parent contracts's
         #'        time frame using this parameter
         #' @param comment The comment to use in the history snapshot.
-        #' @param ... parameters to be passed to [InsuranceContract$new()] when
+        #' @param ... parameters to be passed to \ifelse{html}{\href{#method-new}{\code{InsuranceContract$new()}}}{\code{InsuranceContract$new()()}} when
         #'        \code{block} is not given and a copy of the parent should be
         #'        created with overrides.
         #'
@@ -496,7 +500,7 @@ InsuranceContract = R6Class(
         #'          probably easier to create the contract object from scratch
         #'          again.
         #'
-        #' @param calculate Which values to calculate. See [CalculateEnum]
+        #' @param calculate Which values to calculate. See [CalculationEnum]
         #' @param valuesFrom Calculate only values starting from this time step
         #'        on (all values before that time will be preserved). This is
         #'        required when a contract is changed significantly (potentially
diff --git a/R/InsuranceTarif.R b/R/InsuranceTarif.R
index aadd520711b2107769826a65b911cc0402d520a5..991091f943b9c0b6ef354ce6f5242da8d4519b37 100644
--- a/R/InsuranceTarif.R
+++ b/R/InsuranceTarif.R
@@ -62,9 +62,9 @@ TariffTypeEnum = objectProperties::setSingleEnum(
 #' Most methods of this class are not meant to be called manually, but are supposed
 #' to be called by the InsuranceContract object with contract-specific information.
 #' The only methods that are typically used for defining an insurance tariff are
-#' the constructor [InsuranceTarif$new()] and the cloning method
-#' [InsuranceTarif$createModification()]. All other methods should never be called
-#' manually.
+#' the constructor \href{#method-new}{\code{InsuranceTarif$new()}} and the cloning method
+#' \href{#method-createModification}{\code{InsuranceTarif$createModification()}}.
+#' All other methods should never be called manually.
 #'
 #' However, as overriding private methods is not possible in an R6 class, all the
 #' methods need to be public to allow overriding them in derived classes.
@@ -72,8 +72,8 @@ TariffTypeEnum = objectProperties::setSingleEnum(
 # # Parameters for the constructors
 #' @param name The unique name / ID of the tariff
 #' @param type An enum specifying the main characteristics of the tarif. See [TariffTypeEnum]
-#' @param tarif The tariff's public name. See [InsuranceTarif$tarif]
-#' @param desc A short human-readable description. See [InsuranceTarif$desc]
+#' @param tarif The tariff's public name to be stored in the `tarif` field.
+#' @param desc A short human-readable description to be stored in the `desc` field.
 # # General parameters for (almost) all function
 #' @param params Contract-specific, full set of parameters of the contract
 #'      (merged parameters of the defaults, the tariff, the profit participation
@@ -225,7 +225,7 @@ InsuranceTarif = R6Class(
 
     #' @description create a copy of a tariff with certain parameters changed
     #' @details This method \code{createModification} returns a copy of the tariff
-    #' with all given arguments changed in the tariff's [InsuranceTarif$Parameters]
+    #' with all given arguments changed in the tariff's `InsuranceTarif$Parameters`
     #' parameter list.
     #'
     #' As InsuranceTarif is a R6 class with reference logic, simply assigning
@@ -235,7 +235,7 @@ InsuranceTarif = R6Class(
     #' to the values passed to this method.
     #'
     #' @param tariffType An enum specifying the main characteristics of the tarif.
-    #'       See [tariffType]
+    #'       See [TariffTypeEnum]
     #' @param ... Parameters for the [InsuranceContract.ParameterStructure],
     #'            defining the characteristics of the tariff.
     #' @import MortalityTables
@@ -421,7 +421,7 @@ InsuranceTarif = R6Class(
     },
 
     #' @description Returns the basic (unit) cash flows associated with the type
-    #' of insurance given in the [InsuranceTarif$tariffType] field
+    #' of insurance given in the InsuranceTarif's `tariffType` field
     #' @details Not to be called directly, but implicitly by the [InsuranceContract] object.
     getBasicCashFlows = function(params, values) {
       deferralPeriod = params$ContractData$deferralPeriod;
@@ -583,7 +583,7 @@ InsuranceTarif = R6Class(
     #' @description Returns the present values of the cash flows of the contract
     #' (cash flows already calculated and stored in the \code{cashFlows} data.frame)
     #' @details Not to be called directly, but implicitly by the [InsuranceContract] object.
-    #' @param cashFlows data.frame of cash flows calculated by a call to [InsuranceTarif$getCashFlows()]
+    #' @param cashFlows data.frame of cash flows calculated by a call to \href{#method-getCashFlows}{\code{InsuranceTarif$getCashFlows()}}
     presentValueCashFlows = function(cashFlows, params, values) {
 
       qq = self$getTransitionProbabilities(params);
@@ -642,7 +642,7 @@ InsuranceTarif = R6Class(
     },
 
     #' @description Calculates the present values of the cost cash flows of the
-    #' contract (cost cash flows alreay calculated by [InsuranceTarif$getCashFlowsCosts()]
+    #' contract (cost cash flows alreay calculated by \href{#method-getCashFlowsCosts}{\code{InsuranceTarif$getCashFlowsCosts()}}
     #' and stored in the \code{values} list
     #' @details Not to be called directly, but implicitly by the [InsuranceContract] object.
     presentValueCashFlowsCosts = function(params, values) {
@@ -1128,7 +1128,7 @@ InsuranceTarif = R6Class(
     #'
     #' @details Not to be called directly, but implicitly by the [InsuranceContract] object.
     #' @param ... Additional parameters for the profit participation calculation, passed
-    #'            through to the profit participation scheme's [ProfitParticipation$getProfitParticipation()]
+    #'            through to the profit participation scheme's \href{ProfitParticipation.html#method-getProfitParticipation}{\code{ProfitParticipation$getProfitParticipation()}}
     calculateProfitParticipation = function(params, ...) {
         ppScheme = params$ProfitParticipation$profitParticipationScheme;
         if (!is.null(ppScheme)) {
diff --git a/R/ProfitParticipation.R b/R/ProfitParticipation.R
index a35c7be1c023ffc25b9336dc9f37e7e69d84a427..a289a893797616b20691283f920e8166dcbf08fc 100644
--- a/R/ProfitParticipation.R
+++ b/R/ProfitParticipation.R
@@ -52,7 +52,10 @@ ProfitParticipation = R6Class(
     #'
     #' All elements defined in the profit scheme can be overriden per contract
     #' in the call to \code{[InsuranceContract]$new} or even in the explicit
-    #' call to [InsuranceContract$profitScenario] or [InsuranceContract$addProfitScenario].
+    #' call to \ifelse{html}{\href{InsuranceContract.html#method-profitScenario}{\code{InsuranceContract$profitScenario()}}}{\code{InsuranceContract$profitScenario()()}}
+    #' or \ifelse{html}{\href{InsuranceContract.html#method-addProfitScenario}{\code{InsuranceContract$addProfitScenario()}}}{\code{InsuranceContract$addProfitScenario()()}}.
+    #'
+    #'
     Parameters = InsuranceContract.ParameterStructure$ProfitParticipation,
 
     ########################################################################m#
@@ -136,16 +139,17 @@ ProfitParticipation = R6Class(
     #' @description Create a new profit participation scheme
     #' @details This function is called when a new profit participation scheme
     #' is created with a call to \code{ProfitParticipation$new(...)}. Possible
-    #' parameters to the \code{new}-Call are all parameters from the
-    #' [InsuranceContract.ParameterStructure$ProfitParticipation] parameter
+    #' parameters to the \code{new}-Call are all parameters from the `ProfitParticipation` sublist of the
+    #' [InsuranceContract.ParameterStructure] parameter
     #' structure (which are understood as template values that can be overridden
     #' per contract or even per profit participation scenario) and the components
-    #' of the [ProfitParticipation$Functions] list defining the functions to calculate the individual
+    #' of the `Functions` field defining the functions to calculate the individual
     #' components of the profit participation (rates, calculation bases, calculation, benefits)
     #'
     #' @param name The name of the profit scheme (typicall the name of the profit plan and its version)
-    #' @param ... profit participation parameters to be stored in
-    #'     [ProfitParticipation$Parameters] or calculation functions to be stored in [ProfitParticipation$Functions]
+    #' @param ... profit participation parameters to be stored in the
+    #' `Parameters field or calculation functions to be stored in the `Functions`
+    #' field
     initialize = function(name = NULL, ...) {
       if (!missing(name))           self$name = name;
       self$setParameters(...);
@@ -154,16 +158,15 @@ ProfitParticipation = R6Class(
     },
 
 
-    #' @description Store all passed parameters in the [ProfitParticipation$Parameters] field
-    #' @param ... any of the named fields defined in
-    #'      [InsuranceContract.ParameterStructure$ProfitParticipation]. All other
-    #'      arguments will be ignored
+    #' @description Store all passed parameters in the `Parameters` field
+    #' @param ... any of the named fields defined in the `ProfitParticipation` sublist of the
+    #'      [InsuranceContract.ParameterStructure]. All other arguments will be ignored
     setParameters = function(...) {
         self$Parameters = fillFields(self$Parameters, list(...));
     },
 
-    #' @description Store all passed functions in the [ProfitParticipation$Functions] field
-    #' @param ... any of the functions defined in the [ProfitParticipation$Functions] field. All other
+    #' @description Store all passed functions in the `Functions` field
+    #' @param ... any of the functions defined in the `Functions` field. All other
     #'     arguments will be ignored
     setFunctions = function(...) {
         self$Functions = fillFields(self$Functions, list(...));
@@ -177,7 +180,7 @@ ProfitParticipation = R6Class(
 
     #' @description create a copy of a profit scheme with certain parameters changed
     #' @details This method \code{createModification} returns a copy of the profit scheme
-    #' with all given arguments changed in the schmes's [ProfitParticipation$Parameters]
+    #' with all given arguments changed in the schmes's `Parameters`
     #' parameter list.
     #'
     #' As ProfitParticipation is a R6 class with reference logic, simply assigning
@@ -252,7 +255,7 @@ ProfitParticipation = R6Class(
 
     #' @description Set up the data.frame containing the profit participation rates
     #' @param ... additional parameters passed to the profit calculation functions
-    #'     stored in the [ProfitParticipation$Functions] field.
+      #'     stored in the `Functions` field.
     setupRates = function(params, values, ...) {
         # 1) Profit scheme or contract provides general company-wide profit rates for some years:
         #       profitRates
@@ -364,7 +367,7 @@ ProfitParticipation = R6Class(
     #' @param profitScenario profit participation values from a previous calculation
     #' (NULL if profit calculation is to be calculated from the contract inception).
     #' Values before \code{calculateFrom} will be used from this data.frame.
-    #' @param ... additional parameters to be passed to [ProfitParticipation$setupRates()]
+    #' @param ... additional parameters to be passed to \href{ProfitParticipation.html#method-setupRates}{\code{ProfitParticipation$setupRates()}}
     getProfitParticipation = function(calculateFrom = 0, profitScenario = NULL, params, values, ...) {
         waiting      = valueOrFunction(params$ProfitParticipation$waitingPeriod, params = params, values = values);
         if (is.numeric(waiting) && waiting > 0) {
diff --git a/R/contractGrid.R b/R/contractGrid.R
index 4e7f16c1e3530b0b731facf9befce36720ce4160..53a58a9afdcddc3719bbd327b0f34aa3775383ef 100644
--- a/R/contractGrid.R
+++ b/R/contractGrid.R
@@ -23,7 +23,7 @@
 #' The \code{axes} list describing the parameters changing along the axes of the
 #' resulting grid is internally expanded with [expand.grid()]. The resulting flat
 #' list of parameter (together with the fixed parameters passed as \code{...})
-#' is then passed to the [InsuranceContract$new()] call to create the corresponding
+#' is then passed to the \ifelse{html}{\href{InsuranceContract.html#method-new}{\code{InsuranceContract$new()}}}{\code{InsuranceContract$new()()}} call to create the corresponding
 #' contract object.
 #'
 #' To create the human-readable row-/columnnames of the resulting array,
@@ -36,7 +36,7 @@
 #' @param axes List of paramters spanning the dimensions of the grid.
 #' @param YOB optional year of bith. If missing, the \code{observationYear} and the contract's age
 #' @param observationYear The observation year, for which the grid shall be calculated. If given, the YOB is calculated from it, otherwise the contract's YOB is used
-#' @param ... In \code{contractGrid}: Additional parameters to be passed to [InsuranceContract$new]; In \code{contractGridPremium}: Additional parameters to be passed to \code{contractGrid}.
+#' @param ... In \code{contractGrid}: Additional parameters to be passed to \ifelse{html}{\href{InsuranceContract.html#method-new}{\code{InsuranceContract$new()}}}{\code{InsuranceContract$new()()}}; In \code{contractGridPremium}: Additional parameters to be passed to \code{contractGrid}.
 #
 # Params of the contractGridPreimium function:
 #' @param contractGrid (optional) existing contract grid from which to derive
diff --git a/R/exportInsuranceContractExample.R b/R/exportInsuranceContractExample.R
index 295df7075fa3e4ea7496f3965a73ba5ccb6b7361..bf823ec2a1702d7beecc2c052fd1a108593b9312 100644
--- a/R/exportInsuranceContractExample.R
+++ b/R/exportInsuranceContractExample.R
@@ -42,7 +42,7 @@ NULL
 #'     sumInsured = 1000,
 #'     contractClosing = as.Date("2016-10-01")
 #' );
-#' exportInsuranceContractExample(contract, prf = 10)
+#' \dontrun{exportInsuranceContractExample(contract, prf = 10)}
 #'
 #' @export
 exportInsuranceContractExample = function(contract, prf = 10, outdir = ".", basename=NULL, extraname = NULL, ...) {
diff --git a/R/exportInsuranceContract_xlsx.R b/R/exportInsuranceContract_xlsx.R
index 5bfbe850f6771ed6f2a2bbcff0ad648bc6f28d96..444865cfb0fd7c950ef7b6a030198cfea7f9185c 100644
--- a/R/exportInsuranceContract_xlsx.R
+++ b/R/exportInsuranceContract_xlsx.R
@@ -809,7 +809,7 @@ exportCFTable = function(wb, sheet, contract, ccol = 1, crow = 1, styles = c(),
 #'     sumInsured = 1000,
 #'     contractClosing = as.Date("2016-10-01")
 #' );
-#' exportInsuranceContract.xlsx(contract, "Example_annuity_contract.xlsx")
+#' \dontrun{exportInsuranceContract.xlsx(contract, "Example_annuity_contract.xlsx")}
 #' @export
 exportInsuranceContract.xlsx = function(contract, filename) {
   # TODO: argument checking for contract and filename
diff --git a/R/showVmGlgExamples.R b/R/showVmGlgExamples.R
index c98fa06620bd15beaa16f13e44d0f2dc58ffe2a4..709f6722fafee2e34bb494067566c482590c50a1 100644
--- a/R/showVmGlgExamples.R
+++ b/R/showVmGlgExamples.R
@@ -33,8 +33,9 @@ NULL
 #' showVmGlgExamples(contract)
 #'
 #' # Optionally output to a file rather than the console:
+#' \dontrun{
 #' showVmGlgExamples(contract, file = "annuity-example.txt")
-#'
+#' }
 #' @export
 showVmGlgExamples = function(contract, prf = 10, t = 10, t_prf = 12, file = "", ...) {
 
diff --git a/inst/Beispiele/Endowment_Dynamic_From0_Baseline.xlsx b/inst/Beispiele/Endowment_Dynamic_From0_Baseline.xlsx
deleted file mode 100644
index 1c3fff9eea0c370d183403f308a622513ac23a3d..0000000000000000000000000000000000000000
Binary files a/inst/Beispiele/Endowment_Dynamic_From0_Baseline.xlsx and /dev/null differ
diff --git a/inst/Beispiele/Endowment_Dynamic_From5.xlsx b/inst/Beispiele/Endowment_Dynamic_From5.xlsx
deleted file mode 100644
index fd254f947f0b9236fe4a7162967f03c07e28a5f8..0000000000000000000000000000000000000000
Binary files a/inst/Beispiele/Endowment_Dynamic_From5.xlsx and /dev/null differ
diff --git a/inst/Beispiele/Example_Endowment.R b/inst/Beispiele/Example_Endowment.R
index 0f9670cb659b0ee590c543e609f3077e3e458ac7..e70b8201743619901ef5251f01b41aababd80417 100644
--- a/inst/Beispiele/Example_Endowment.R
+++ b/inst/Beispiele/Example_Endowment.R
@@ -105,32 +105,5 @@ contract.Bsp.waiver = InsuranceContract$
     contractClosing = as.Date("2020-07-01"),
     id = "Hauptvertrag"
   )$premiumWaiver(t = 5)
-exportInsuranceContract.xlsx(contract.Bsp.waiver, filename = "BEISPIEL_Contract_PrfALT.xlsx")
-
-contract.Bsp.waiverNew = InsuranceContract$
-  new(
-    Tarif.Bsp,
-    age = 35, policyPeriod = 15, premiumPeriod = 15,
-    premiumFrequency = 12,
-    sumInsured = 100000,
-    contractClosing = as.Date("2020-07-01"),
-    id = "Hauptvertrag"
-  )$premiumWaiverNew(t = 5)
-exportInsuranceContract.xlsx(contract.Bsp.waiverNew, filename = "BEISPIEL_Contract_PrfNEU.xlsx")
-
-contract.Bsp.waiver$Values$cashFlowsBasic == contract.Bsp.waiverNew$Values$cashFlowsBasic
-contract.Bsp.waiver$Values$cashFlows == contract.Bsp.waiverNew$Values$cashFlows
-contract.Bsp.waiver$Values$cashFlowsCosts == contract.Bsp.waiverNew$Values$cashFlowsCosts
-contract.Bsp.waiver$Values$presentValues == contract.Bsp.waiverNew$Values$presentValues
-contract.Bsp.waiver$Values$presentValuesCosts == contract.Bsp.waiverNew$Values$presentValuesCosts
-
-contract.Bsp.waiver$Values$reserves == contract.Bsp.waiverNew$Values$reserves
-contract.Bsp.waiver$Values$reservesBalanceSheet == contract.Bsp.waiverNew$Values$reservesBalanceSheet
-
-contract.Bsp.waiver$Values$absCashFlows == contract.Bsp.waiverNew$Values$absCashFlows
-contract.Bsp.waiver$Values$absPresentValues == contract.Bsp.waiverNew$Values$absPresentValues
-contract.Bsp.waiver$Values$premiumComposition == contract.Bsp.waiverNew$Values$premiumComposition
-contract.Bsp.waiver$Values$premiumCompositionSums == contract.Bsp.waiverNew$Values$premiumCompositionSums
-contract.Bsp.waiver$Values$premiumCompositionPV == contract.Bsp.waiverNew$Values$premiumCompositionPV
-contract.Bsp.waiver$Values$basicData == contract.Bsp.waiverNew$Values$basicData
+exportInsuranceContract.xlsx(contract.Bsp.waiver, filename = "BEISPIEL_Contract_PrWaiver.xlsx")
 
diff --git a/man/InsuranceContract.Rd b/man/InsuranceContract.Rd
index a961b705582eee42148f0d718c1e26070cc5b976..3bad207ce77485abe06ae52abbcd859e0f537f1c 100644
--- a/man/InsuranceContract.Rd
+++ b/man/InsuranceContract.Rd
@@ -15,10 +15,11 @@ all other relevant contract parameters (if not defined by the tariff or
 explicitly overridden by the contract) can be given in the constructor.
 }
 \section{Usage}{
-The typical usage of this class is to simply call \code{\link[=InsuranceContract$new]{InsuranceContract$new()}}.
+The typical usage of this class is to simply call
+\ifelse{html}{\href{#method-new}{\code{InsuranceContract$new()}}}{\code{InsuranceContract$new()()}}.
 
 All parameters from the \link{InsuranceContract.ParameterDefaults} can be passed
-to the constructor of the class (i.e. the \code{\link[=InsuranceContract$new]{InsuranceContract$new()}}-call).
+to the constructor of the class (i.e. the \ifelse{html}{\href{#method-new}{\code{InsuranceContract$new()}}}{\code{InsuranceContract$new()()}}-call).
 Parameters not explicitly given, will be taken from the tariff or as a fall-back
 mechanism from the \link{InsuranceContract.ParameterDefaults} defaults.
 
@@ -29,7 +30,7 @@ field of the object.
 
 \section{Calculation approach: Valuation}{
 The calculation of all contract values is controlled by the function
-\code{\link[=InsuranceContract$calculateContract]{InsuranceContract$calculateContract()}} (using methods of the \link{InsuranceTarif}
+\ifelse{html}{\href{method-calculateContract}{\code{InsuranceContract$calculateContract()}}}{\code{InsuranceContract$calculateContract()()}} (using methods of the \link{InsuranceTarif}
 object) and follows the following logic:
 \enumerate{
 \item First the \strong{contingent (unit) cash flows} and the \strong{transition probbilities}
@@ -69,7 +70,8 @@ discounted reserves at times $t$ and $t+1$).
 included, the corresponding \link{ProfitParticipation} object can calculate that
 profit sharing amounts, once all guaranteed values are calculated. This can
 also be triggered manually (with custom profit sharing rates) by calling
-the methods \code{\link[=InsuranceContract$profitScenario]{InsuranceContract$profitScenario()}} or \code{\link[=InsuranceContract$addProfitScenario]{InsuranceContract$addProfitScenario()}}.
+the methods \ifelse{html}{\href{#method-profitScenario}{\code{InsuranceContract$profitScenario()}}}{\code{InsuranceContract$profitScenario()()}}]
+or \ifelse{html}{\href{#method-addProfitScenario}{\code{InsuranceContract$addProfitScenario()}}}{\code{InsuranceContract$addProfitScenario()()}}.
 }
 }
 
@@ -376,14 +378,14 @@ parameter is used internally, but should not be used in
 user-written code.}
 
 \item{\code{calculate}}{how much of the contract's time series need to be
-calculated. See \link{CalculateEnum} for all possible values. This
+calculated. See \link{CalculationEnum} for all possible values. This
 is usefull to prevent calculation of e.g. reserves and profit
 participation, when one only wants to create a grid of premiums.}
 
 \item{\code{profitid}}{The ID of the default profit participation scenario.
 The default profit participation scenario uses the default
 values passed, while further scenarios can be added by
-\code{\link[=InsuranceContract$addProfitScenario]{InsuranceContract$addProfitScenario()}}.}
+\ifelse{html}{\href{#method-addProfitScenario}{\code{InsuranceContract$addProfitScenario()}}}{\code{InsuranceContract$addProfitScenario()()}}.}
 
 \item{\code{...}}{Further parameters (age, sum insured, contract closing /
 begin, premium payment details, etc.) of the contract, which
@@ -479,7 +481,7 @@ time frame using this parameter}
 
 \item{\code{comment}}{The comment to use in the history snapshot.}
 
-\item{\code{...}}{parameters to be passed to \code{\link[=InsuranceContract$new]{InsuranceContract$new()}} when
+\item{\code{...}}{parameters to be passed to \ifelse{html}{\href{#method-new}{\code{InsuranceContract$new()}}}{\code{InsuranceContract$new()()}} when
 \code{block} is not given and a copy of the parent should be
 created with overrides.}
 }
@@ -567,7 +569,7 @@ Calculate all time series of the contract from the parameters
 \subsection{Arguments}{
 \if{html}{\out{<div class="arguments">}}
 \describe{
-\item{\code{calculate}}{Which values to calculate. See \link{CalculateEnum}}
+\item{\code{calculate}}{Which values to calculate. See \link{CalculationEnum}}
 
 \item{\code{valuesFrom}}{Calculate only values starting from this time step
 on (all values before that time will be preserved). This is
diff --git a/man/InsuranceTarif.Rd b/man/InsuranceTarif.Rd
index b41e95fcfaff8beac1a59aa908181b8d2eb5658d..8d348304f8b4491429a8d6d03b68562c9b7756b3 100644
--- a/man/InsuranceTarif.Rd
+++ b/man/InsuranceTarif.Rd
@@ -20,9 +20,9 @@ tariff-specific calculations.
 Most methods of this class are not meant to be called manually, but are supposed
 to be called by the InsuranceContract object with contract-specific information.
 The only methods that are typically used for defining an insurance tariff are
-the constructor \code{\link[=InsuranceTarif$new]{InsuranceTarif$new()}} and the cloning method
-\code{\link[=InsuranceTarif$createModification]{InsuranceTarif$createModification()}}. All other methods should never be called
-manually.
+the constructor \href{#method-new}{\code{InsuranceTarif$new()}} and the cloning method
+\href{#method-createModification}{\code{InsuranceTarif$createModification()}}.
+All other methods should never be called manually.
 
 However, as overriding private methods is not possible in an R6 class, all the
 methods need to be public to allow overriding them in derived classes.
@@ -191,9 +191,9 @@ Initialize a new tariff object
 
 \item{\code{type}}{An enum specifying the main characteristics of the tarif. See \link{TariffTypeEnum}}
 
-\item{\code{tarif}}{The tariff's public name. See \link{InsuranceTarif$tarif}}
+\item{\code{tarif}}{The tariff's public name to be stored in the \code{tarif} field.}
 
-\item{\code{desc}}{A short human-readable description. See \link{InsuranceTarif$desc}}
+\item{\code{desc}}{A short human-readable description to be stored in the \code{desc} field.}
 
 \item{\code{...}}{Parameters for the \link{InsuranceContract.ParameterStructure},
 defining the characteristics of the tariff.}
@@ -262,12 +262,12 @@ create a copy of a tariff with certain parameters changed
 \describe{
 \item{\code{name}}{The unique name / ID of the tariff}
 
-\item{\code{tarif}}{The tariff's public name. See \link{InsuranceTarif$tarif}}
+\item{\code{tarif}}{The tariff's public name to be stored in the \code{tarif} field.}
 
-\item{\code{desc}}{A short human-readable description. See \link{InsuranceTarif$desc}}
+\item{\code{desc}}{A short human-readable description to be stored in the \code{desc} field.}
 
 \item{\code{tariffType}}{An enum specifying the main characteristics of the tarif.
-See \link{tariffType}}
+See \link{TariffTypeEnum}}
 
 \item{\code{...}}{Parameters for the \link{InsuranceContract.ParameterStructure},
 defining the characteristics of the tariff.}
@@ -276,7 +276,7 @@ defining the characteristics of the tariff.}
 }
 \subsection{Details}{
 This method \code{createModification} returns a copy of the tariff
-with all given arguments changed in the tariff's \link{InsuranceTarif$Parameters}
+with all given arguments changed in the tariff's \code{InsuranceTarif$Parameters}
 parameter list.
 
 As InsuranceTarif is a R6 class with reference logic, simply assigning
@@ -540,7 +540,7 @@ Not to be called directly, but implicitly by the \link{InsuranceContract} object
 \if{latex}{\out{\hypertarget{method-getBasicCashFlows}{}}}
 \subsection{Method \code{getBasicCashFlows()}}{
 Returns the basic (unit) cash flows associated with the type
-of insurance given in the \link{InsuranceTarif$tariffType} field
+of insurance given in the InsuranceTarif's \code{tariffType} field
 \subsection{Usage}{
 \if{html}{\out{<div class="r">}}\preformatted{InsuranceTarif$getBasicCashFlows(params, values)}\if{html}{\out{</div>}}
 }
@@ -628,7 +628,7 @@ Returns the present values of the cash flows of the contract
 \subsection{Arguments}{
 \if{html}{\out{<div class="arguments">}}
 \describe{
-\item{\code{cashFlows}}{data.frame of cash flows calculated by a call to \code{\link[=InsuranceTarif$getCashFlows]{InsuranceTarif$getCashFlows()}}}
+\item{\code{cashFlows}}{data.frame of cash flows calculated by a call to \href{#method-getCashFlows}{\code{InsuranceTarif$getCashFlows()}}}
 
 \item{\code{params}}{Contract-specific, full set of parameters of the contract
 (merged parameters of the defaults, the tariff, the profit participation
@@ -649,7 +649,7 @@ Not to be called directly, but implicitly by the \link{InsuranceContract} object
 \if{latex}{\out{\hypertarget{method-presentValueCashFlowsCosts}{}}}
 \subsection{Method \code{presentValueCashFlowsCosts()}}{
 Calculates the present values of the cost cash flows of the
-contract (cost cash flows alreay calculated by \code{\link[=InsuranceTarif$getCashFlowsCosts]{InsuranceTarif$getCashFlowsCosts()}}
+contract (cost cash flows alreay calculated by \href{#method-getCashFlowsCosts}{\code{InsuranceTarif$getCashFlowsCosts()}}
 and stored in the \code{values} list
 \subsection{Usage}{
 \if{html}{\out{<div class="r">}}\preformatted{InsuranceTarif$presentValueCashFlowsCosts(params, values)}\if{html}{\out{</div>}}
@@ -988,7 +988,7 @@ parameters and the already calculated reserves of the contract.
 scheme and the contract)}
 
 \item{\code{...}}{Additional parameters for the profit participation calculation, passed
-through to the profit participation scheme's \code{\link[=ProfitParticipation$getProfitParticipation]{ProfitParticipation$getProfitParticipation()}}}
+through to the profit participation scheme's \href{ProfitParticipation.html#method-getProfitParticipation}{\code{ProfitParticipation$getProfitParticipation()}}}
 }
 \if{html}{\out{</div>}}
 }
diff --git a/man/ProfitParticipation.Rd b/man/ProfitParticipation.Rd
index 6dbd719322dc3e2c97308eb9eb8cb434751e4c0e..f28b88442e108e01b3d5d61ac639e35085daf617 100644
--- a/man/ProfitParticipation.Rd
+++ b/man/ProfitParticipation.Rd
@@ -24,15 +24,15 @@ profit scheme comes into play) and a discretionary profit on top.
 
 This function is called when a new profit participation scheme
 is created with a call to \code{ProfitParticipation$new(...)}. Possible
-parameters to the \code{new}-Call are all parameters from the
-\link{InsuranceContract.ParameterStructure$ProfitParticipation} parameter
+parameters to the \code{new}-Call are all parameters from the \code{ProfitParticipation} sublist of the
+\link{InsuranceContract.ParameterStructure} parameter
 structure (which are understood as template values that can be overridden
 per contract or even per profit participation scenario) and the components
-of the \link{ProfitParticipation$Functions} list defining the functions to calculate the individual
+of the \code{Functions} field defining the functions to calculate the individual
 components of the profit participation (rates, calculation bases, calculation, benefits)
 
 This method \code{createModification} returns a copy of the profit scheme
-with all given arguments changed in the schmes's \link{ProfitParticipation$Parameters}
+with all given arguments changed in the schmes's \code{Parameters}
 parameter list.
 
 As ProfitParticipation is a R6 class with reference logic, simply assigning
@@ -71,7 +71,8 @@ parameters, i.e. the \code{ProfitParticipation} element of the
 
 All elements defined in the profit scheme can be overriden per contract
 in the call to \code{[InsuranceContract]$new} or even in the explicit
-call to \link{InsuranceContract$profitScenario} or \link{InsuranceContract$addProfitScenario}.}
+call to \ifelse{html}{\href{InsuranceContract.html#method-profitScenario}{\code{InsuranceContract$profitScenario()}}}{\code{InsuranceContract$profitScenario()()}}
+or \ifelse{html}{\href{InsuranceContract.html#method-addProfitScenario}{\code{InsuranceContract$addProfitScenario()}}}{\code{InsuranceContract$addProfitScenario()()}}.}
 
 \item{\code{Functions}}{list of functions defined to calculate the individual
 components. For each of the profit components
@@ -123,8 +124,9 @@ Create a new profit participation scheme
 \describe{
 \item{\code{name}}{The name of the profit scheme (typicall the name of the profit plan and its version)}
 
-\item{\code{...}}{profit participation parameters to be stored in
-\link{ProfitParticipation$Parameters} or calculation functions to be stored in \link{ProfitParticipation$Functions}}
+\item{\code{...}}{profit participation parameters to be stored in the
+\verb{Parameters field or calculation functions to be stored in the }Functions`
+field}
 }
 \if{html}{\out{</div>}}
 }
@@ -133,7 +135,7 @@ Create a new profit participation scheme
 \if{html}{\out{<a id="method-setParameters"></a>}}
 \if{latex}{\out{\hypertarget{method-setParameters}{}}}
 \subsection{Method \code{setParameters()}}{
-Store all passed parameters in the \link{ProfitParticipation$Parameters} field
+Store all passed parameters in the \code{Parameters} field
 \subsection{Usage}{
 \if{html}{\out{<div class="r">}}\preformatted{ProfitParticipation$setParameters(...)}\if{html}{\out{</div>}}
 }
@@ -141,9 +143,8 @@ Store all passed parameters in the \link{ProfitParticipation$Parameters} field
 \subsection{Arguments}{
 \if{html}{\out{<div class="arguments">}}
 \describe{
-\item{\code{...}}{any of the named fields defined in
-\link{InsuranceContract.ParameterStructure$ProfitParticipation}. All other
-arguments will be ignored}
+\item{\code{...}}{any of the named fields defined in the \code{ProfitParticipation} sublist of the
+\link{InsuranceContract.ParameterStructure}. All other arguments will be ignored}
 }
 \if{html}{\out{</div>}}
 }
@@ -152,7 +153,7 @@ arguments will be ignored}
 \if{html}{\out{<a id="method-setFunctions"></a>}}
 \if{latex}{\out{\hypertarget{method-setFunctions}{}}}
 \subsection{Method \code{setFunctions()}}{
-Store all passed functions in the \link{ProfitParticipation$Functions} field
+Store all passed functions in the \code{Functions} field
 \subsection{Usage}{
 \if{html}{\out{<div class="r">}}\preformatted{ProfitParticipation$setFunctions(...)}\if{html}{\out{</div>}}
 }
@@ -160,7 +161,7 @@ Store all passed functions in the \link{ProfitParticipation$Functions} field
 \subsection{Arguments}{
 \if{html}{\out{<div class="arguments">}}
 \describe{
-\item{\code{...}}{any of the functions defined in the \link{ProfitParticipation$Functions} field. All other
+\item{\code{...}}{any of the functions defined in the \code{Functions} field. All other
 arguments will be ignored}
 }
 \if{html}{\out{</div>}}
@@ -280,7 +281,7 @@ scheme and the contract)}
 insurance contract, including cash flows, premiums, reserves etc.).}
 
 \item{\code{...}}{additional parameters passed to the profit calculation functions
-stored in the \link{ProfitParticipation$Functions} field.}
+stored in the \code{Functions} field.}
 }
 \if{html}{\out{</div>}}
 }
@@ -345,7 +346,7 @@ scheme and the contract)}
 \item{\code{values}}{Contract values calculated so far (guaranteed component of the
 insurance contract, including cash flows, premiums, reserves etc.).}
 
-\item{\code{...}}{additional parameters to be passed to \code{\link[=ProfitParticipation$setupRates]{ProfitParticipation$setupRates()}}}
+\item{\code{...}}{additional parameters to be passed to \href{ProfitParticipation.html#method-setupRates}{\code{ProfitParticipation$setupRates()}}}
 }
 \if{html}{\out{</div>}}
 }
diff --git a/man/SexSingleEnum-class.Rd b/man/SexSingleEnum-class.Rd
index 7bb521b6bb3b128251a9ef148144597b82bc22e8..370804b793ebf930193b6dc2473833dd6edcb5e6 100644
--- a/man/SexSingleEnum-class.Rd
+++ b/man/SexSingleEnum-class.Rd
@@ -4,9 +4,9 @@
 \name{SexSingleEnum-class}
 \alias{SexSingleEnum-class}
 \alias{SexEnum}
-\title{Enum to describe possble sexes in an insurance contract or tariff.}
+\title{Enum to describe possible sexes in an insurance contract or tariff.}
 \description{
-Enum to describe possble sexes in an insurance contract or tariff.
+Enum to describe possible sexes in an insurance contract or tariff.
 }
 \details{
 Currently, only possible values are allowed;
diff --git a/man/contractGrid.Rd b/man/contractGrid.Rd
index 524269162e1aa7f051c2cd847469d058189c93df..b9b21cca7ec45e694cdb9c23b51b2462e58f388f 100644
--- a/man/contractGrid.Rd
+++ b/man/contractGrid.Rd
@@ -26,7 +26,7 @@ contractGridPremium(
 
 \item{observationYear}{The observation year, for which the grid shall be calculated. If given, the YOB is calculated from it, otherwise the contract's YOB is used}
 
-\item{...}{In \code{contractGrid}: Additional parameters to be passed to \link{InsuranceContract$new}; In \code{contractGridPremium}: Additional parameters to be passed to \code{contractGrid}.}
+\item{...}{In \code{contractGrid}: Additional parameters to be passed to \ifelse{html}{\href{InsuranceContract.html#method-new}{\code{InsuranceContract$new()}}}{\code{InsuranceContract$new()()}}; In \code{contractGridPremium}: Additional parameters to be passed to \code{contractGrid}.}
 
 \item{contractGrid}{(optional) existing contract grid from which to derive
 premiums. If not given, \link{contractGrid} is called with all parameters, so
@@ -64,7 +64,7 @@ function \code{contractGridPremium}.
 The \code{axes} list describing the parameters changing along the axes of the
 resulting grid is internally expanded with \code{\link[=expand.grid]{expand.grid()}}. The resulting flat
 list of parameter (together with the fixed parameters passed as \code{...})
-is then passed to the \code{\link[=InsuranceContract$new]{InsuranceContract$new()}} call to create the corresponding
+is then passed to the \ifelse{html}{\href{InsuranceContract.html#method-new}{\code{InsuranceContract$new()}}}{\code{InsuranceContract$new()()}} call to create the corresponding
 contract object.
 
 To create the human-readable row-/columnnames of the resulting array,
diff --git a/man/exportInsuranceContract.xlsx.Rd b/man/exportInsuranceContract.xlsx.Rd
index 59c9177fa391eae989fe76e9a65d5e156e7d435b..7dad96fab80a227d308ca45719f8e08da566de23 100644
--- a/man/exportInsuranceContract.xlsx.Rd
+++ b/man/exportInsuranceContract.xlsx.Rd
@@ -37,5 +37,5 @@ contract = InsuranceContract$new(
     sumInsured = 1000,
     contractClosing = as.Date("2016-10-01")
 );
-exportInsuranceContract.xlsx(contract, "Example_annuity_contract.xlsx")
+\dontrun{exportInsuranceContract.xlsx(contract, "Example_annuity_contract.xlsx")}
 }
diff --git a/man/exportInsuranceContractExample.Rd b/man/exportInsuranceContractExample.Rd
index 237a83c9d0dedebd5070be0b7758cf599df3a756..f8a59beabfbcd605529f357aed2b228b90d605a8 100644
--- a/man/exportInsuranceContractExample.Rd
+++ b/man/exportInsuranceContractExample.Rd
@@ -60,6 +60,6 @@ contract = InsuranceContract$new(
     sumInsured = 1000,
     contractClosing = as.Date("2016-10-01")
 );
-exportInsuranceContractExample(contract, prf = 10)
+\dontrun{exportInsuranceContractExample(contract, prf = 10)}
 
 }
diff --git a/man/showVmGlgExamples.Rd b/man/showVmGlgExamples.Rd
index b948d40a79d11e0e4e609f453a3e1b75c0ddd57a..8a21d515bc8687a0dda75f023950f050832cec36 100644
--- a/man/showVmGlgExamples.Rd
+++ b/man/showVmGlgExamples.Rd
@@ -40,6 +40,7 @@ contract = InsuranceContract$new(
 showVmGlgExamples(contract)
 
 # Optionally output to a file rather than the console:
+\dontrun{
 showVmGlgExamples(contract, file = "annuity-example.txt")
-
+}
 }