diff --git a/DESCRIPTION b/DESCRIPTION
index bf19532..da35728 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -49,4 +49,4 @@ Encoding: UTF-8
 Language: en-US
 LazyData: true
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.3.3
+Config/roxygen2/version: 8.0.0
diff --git a/NAMESPACE b/NAMESPACE
index cd03c4b..e7a83ae 100644
--- a/NAMESPACE
+++ b/NAMESPACE
@@ -15,6 +15,7 @@ S3method(.picker_icon,integer)
 S3method(.picker_icon,logical)
 S3method(.picker_icon,numeric)
 S3method(.picker_icon,primary_key)
+S3method(call_condition_operators,interaction)
 S3method(determine,datasets)
 S3method(determine,values)
 S3method(determine,variables)
diff --git a/R/interaction.R b/R/interaction.R
index 3f126f8..eb53ddb 100644
--- a/R/interaction.R
+++ b/R/interaction.R
@@ -51,7 +51,7 @@ interaction_vars <- function(var1, var2, vars = tidyselect::peek_vars(fn = "inte
   )
 }
 
-#' @method call_condition_operators interaction
+#' @exportS3Method
 #' @keywords internal
 call_condition_operators.interaction <- function(x, choices) {
   checkmate::assert_character(x, len = 2)
diff --git a/man/as.picks.Rd b/man/as.picks.Rd
index 1feab7f..29b69b1 100644
--- a/man/as.picks.Rd
+++ b/man/as.picks.Rd
@@ -21,12 +21,12 @@ teal_transform_filter(x, label = "Filter")
 Helper functions to ease transition between \code{\link[teal.transform:data_extract_spec]{teal.transform::data_extract_spec()}} and \code{\link[=picks]{picks()}}.
 }
 \details{
-With introduction of \code{\link{picks}}, \code{\link[teal.transform:data_extract_spec]{teal.transform::data_extract_spec}} will no longer serve a primary tool to
-define variable choices and default selection in teal-modules and eventually \code{\link[teal.transform:data_extract_spec]{teal.transform::data_extract_spec}}
+With introduction of \code{\link{picks}}, \code{\link[teal.transform:data_extract_spec]{data_extract_spec}} will no longer serve a primary tool to
+define variable choices and default selection in teal-modules and eventually \code{\link[teal.transform:data_extract_spec]{data_extract_spec}}
 will be deprecated.
 To ease the transition to the new tool, we provide \code{as.picks} method which can handle 1:1
-conversion from \code{\link[teal.transform:data_extract_spec]{teal.transform::data_extract_spec}} to \code{\link{picks}}. Unfortunately, when \code{\link[teal.transform:data_extract_spec]{teal.transform::data_extract_spec}}
-contains \code{\link[teal.transform:filter_spec]{teal.transform::filter_spec}} then \code{as.picks} is unable to provide reliable \code{\link{picks}} equivalent.
+conversion from \code{\link[teal.transform:data_extract_spec]{data_extract_spec}} to \code{\link{picks}}. Unfortunately, when \code{\link[teal.transform:data_extract_spec]{data_extract_spec}}
+contains \code{\link[teal.transform:filter_spec]{filter_spec}} then \code{as.picks} is unable to provide reliable \code{\link{picks}} equivalent.
 }
 \examples{
 # convert des with eager select_spec
diff --git a/man/resolver.Rd b/man/resolver.Rd
index 85efb42..ca1e469 100644
--- a/man/resolver.Rd
+++ b/man/resolver.Rd
@@ -9,7 +9,7 @@ resolver(x, data)
 \arguments{
 \item{x}{(\code{\link[=picks]{picks()}}) settings for picks.}
 
-\item{data}{(\code{\link[teal.data:teal_data]{teal.data::teal_data()}} \code{environment} or \code{list}) any data collection supporting object extraction with \code{[[}.
+\item{data}{(\code{\link[teal.data:teal_data]{teal_data()}} \code{environment} or \code{list}) any data collection supporting object extraction with \code{[[}.
 Used to determine values of unresolved \code{picks}.}
 }
 \value{
diff --git a/man/tm_merge.Rd b/man/tm_merge.Rd
index 247e56b..685785f 100644
--- a/man/tm_merge.Rd
+++ b/man/tm_merge.Rd
@@ -16,7 +16,7 @@ For \code{modules()} defaults to \code{"root"}. See \code{Details}.}
 To learn more check \code{vignette("transform-input-data", package = "teal")}.}
 }
 \description{
-Example \code{\link[teal:teal_modules]{teal::module}} containing interactive inputs and displaying results of merge.
+Example \code{\link[teal:module]{teal::module}} containing interactive inputs and displaying results of merge.
 }
 \examples{
 library(teal)