diff --git a/DESCRIPTION b/DESCRIPTION
index f890f16b..9c8f0219 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -48,6 +48,6 @@ URL: https://github.com/obiba/opalr/,
     https://journals.plos.org/ploscompbiol/article?id=10.1371/journal.pcbi.1008880,
     https://www.datashield.org/
 BugReports: https://github.com/obiba/opalr/issues/
-RoxygenNote: 7.2.3
+RoxygenNote: 7.3.1
 VignetteBuilder: knitr
 Encoding: UTF-8
diff --git a/R/opal.R b/R/opal.R
index c2ddca06..ffded8fc 100644
--- a/R/opal.R
+++ b/R/opal.R
@@ -318,7 +318,15 @@ opal.delete <- function(opal, ..., query = list(), callback = NULL) {
 #' @import utils
 #' @keywords internal
 .url <- function(opal, ...) {
-  utils::URLencode(paste(opal$url, "ws", paste(c(...), collapse = "/"), sep = "/"))
+  parts <- c(...)
+  parts <- parts[parts != ""]
+  .cleanUrl(utils::URLencode(paste(opal$url, "ws", paste(parts, collapse = "/"), sep = "/")))
+}
+
+# Function to replace duplicated slashes but preserve '://'
+.cleanUrl <- function(url) {
+  # Replace duplicated slashes only after the protocol (://)
+  gsub("(?<!:)//+", "/", url, perl = TRUE)
 }
 
 #' Constructs the value for the Authorization header
@@ -598,7 +606,7 @@ opal.delete <- function(opal, ..., query = list(), callback = NULL) {
   opal$uprofile <- .handleResponse(opal, r)
   opal$username <- opal$uprofile$principal
   
-  if (isTRUE(o$uprofile$otpRequired)) {
+  if (isTRUE(opal$uprofile$otpRequired)) {
     warning("Enabling 2FA is required, connect to Opal web page to set up your secret.", call. = FALSE)
   }
   
diff --git a/man/dsadmin.get_method.Rd b/man/dsadmin.get_method.Rd
index 41c459be..9947e4e5 100644
--- a/man/dsadmin.get_method.Rd
+++ b/man/dsadmin.get_method.Rd
@@ -33,14 +33,14 @@ Other DataSHIELD functions:
 \code{\link{dsadmin.install_local_package}()},
 \code{\link{dsadmin.install_package}()},
 \code{\link{dsadmin.installed_package}()},
-\code{\link{dsadmin.package_descriptions}()},
 \code{\link{dsadmin.package_description}()},
+\code{\link{dsadmin.package_descriptions}()},
 \code{\link{dsadmin.publish_package}()},
 \code{\link{dsadmin.remove_package}()},
-\code{\link{dsadmin.rm_methods}()},
 \code{\link{dsadmin.rm_method}()},
-\code{\link{dsadmin.rm_options}()},
+\code{\link{dsadmin.rm_methods}()},
 \code{\link{dsadmin.rm_option}()},
+\code{\link{dsadmin.rm_options}()},
 \code{\link{dsadmin.rm_package_methods}()},
 \code{\link{dsadmin.set_method}()},
 \code{\link{dsadmin.set_option}()},
diff --git a/man/dsadmin.get_methods.Rd b/man/dsadmin.get_methods.Rd
index bb9a4a88..d18ab58c 100644
--- a/man/dsadmin.get_methods.Rd
+++ b/man/dsadmin.get_methods.Rd
@@ -31,14 +31,14 @@ Other DataSHIELD functions:
 \code{\link{dsadmin.install_local_package}()},
 \code{\link{dsadmin.install_package}()},
 \code{\link{dsadmin.installed_package}()},
-\code{\link{dsadmin.package_descriptions}()},
 \code{\link{dsadmin.package_description}()},
+\code{\link{dsadmin.package_descriptions}()},
 \code{\link{dsadmin.publish_package}()},
 \code{\link{dsadmin.remove_package}()},
-\code{\link{dsadmin.rm_methods}()},
 \code{\link{dsadmin.rm_method}()},
-\code{\link{dsadmin.rm_options}()},
+\code{\link{dsadmin.rm_methods}()},
 \code{\link{dsadmin.rm_option}()},
+\code{\link{dsadmin.rm_options}()},
 \code{\link{dsadmin.rm_package_methods}()},
 \code{\link{dsadmin.set_method}()},
 \code{\link{dsadmin.set_option}()},
diff --git a/man/dsadmin.get_options.Rd b/man/dsadmin.get_options.Rd
index ebc9b6be..4415982b 100644
--- a/man/dsadmin.get_options.Rd
+++ b/man/dsadmin.get_options.Rd
@@ -23,20 +23,20 @@ opal.logout(o)
 }
 \seealso{
 Other DataSHIELD functions: 
-\code{\link{dsadmin.get_methods}()},
 \code{\link{dsadmin.get_method}()},
+\code{\link{dsadmin.get_methods}()},
 \code{\link{dsadmin.install_github_package}()},
 \code{\link{dsadmin.install_local_package}()},
 \code{\link{dsadmin.install_package}()},
 \code{\link{dsadmin.installed_package}()},
-\code{\link{dsadmin.package_descriptions}()},
 \code{\link{dsadmin.package_description}()},
+\code{\link{dsadmin.package_descriptions}()},
 \code{\link{dsadmin.publish_package}()},
 \code{\link{dsadmin.remove_package}()},
-\code{\link{dsadmin.rm_methods}()},
 \code{\link{dsadmin.rm_method}()},
-\code{\link{dsadmin.rm_options}()},
+\code{\link{dsadmin.rm_methods}()},
 \code{\link{dsadmin.rm_option}()},
+\code{\link{dsadmin.rm_options}()},
 \code{\link{dsadmin.rm_package_methods}()},
 \code{\link{dsadmin.set_method}()},
 \code{\link{dsadmin.set_option}()},
diff --git a/man/dsadmin.install_github_package.Rd b/man/dsadmin.install_github_package.Rd
index 7a45e7cb..9067745d 100644
--- a/man/dsadmin.install_github_package.Rd
+++ b/man/dsadmin.install_github_package.Rd
@@ -38,20 +38,20 @@ opal.logout(o)
 }
 \seealso{
 Other DataSHIELD functions: 
-\code{\link{dsadmin.get_methods}()},
 \code{\link{dsadmin.get_method}()},
+\code{\link{dsadmin.get_methods}()},
 \code{\link{dsadmin.get_options}()},
 \code{\link{dsadmin.install_local_package}()},
 \code{\link{dsadmin.install_package}()},
 \code{\link{dsadmin.installed_package}()},
-\code{\link{dsadmin.package_descriptions}()},
 \code{\link{dsadmin.package_description}()},
+\code{\link{dsadmin.package_descriptions}()},
 \code{\link{dsadmin.publish_package}()},
 \code{\link{dsadmin.remove_package}()},
-\code{\link{dsadmin.rm_methods}()},
 \code{\link{dsadmin.rm_method}()},
-\code{\link{dsadmin.rm_options}()},
+\code{\link{dsadmin.rm_methods}()},
 \code{\link{dsadmin.rm_option}()},
+\code{\link{dsadmin.rm_options}()},
 \code{\link{dsadmin.rm_package_methods}()},
 \code{\link{dsadmin.set_method}()},
 \code{\link{dsadmin.set_option}()},
diff --git a/man/dsadmin.install_local_package.Rd b/man/dsadmin.install_local_package.Rd
index 448254c3..20f9ea5e 100644
--- a/man/dsadmin.install_local_package.Rd
+++ b/man/dsadmin.install_local_package.Rd
@@ -29,20 +29,20 @@ opal.logout(o)
 }
 \seealso{
 Other DataSHIELD functions: 
-\code{\link{dsadmin.get_methods}()},
 \code{\link{dsadmin.get_method}()},
+\code{\link{dsadmin.get_methods}()},
 \code{\link{dsadmin.get_options}()},
 \code{\link{dsadmin.install_github_package}()},
 \code{\link{dsadmin.install_package}()},
 \code{\link{dsadmin.installed_package}()},
-\code{\link{dsadmin.package_descriptions}()},
 \code{\link{dsadmin.package_description}()},
+\code{\link{dsadmin.package_descriptions}()},
 \code{\link{dsadmin.publish_package}()},
 \code{\link{dsadmin.remove_package}()},
-\code{\link{dsadmin.rm_methods}()},
 \code{\link{dsadmin.rm_method}()},
-\code{\link{dsadmin.rm_options}()},
+\code{\link{dsadmin.rm_methods}()},
 \code{\link{dsadmin.rm_option}()},
+\code{\link{dsadmin.rm_options}()},
 \code{\link{dsadmin.rm_package_methods}()},
 \code{\link{dsadmin.set_method}()},
 \code{\link{dsadmin.set_option}()},
diff --git a/man/dsadmin.install_package.Rd b/man/dsadmin.install_package.Rd
index c5559ca8..f6c0035c 100644
--- a/man/dsadmin.install_package.Rd
+++ b/man/dsadmin.install_package.Rd
@@ -38,20 +38,20 @@ opal.logout(o)
 }
 \seealso{
 Other DataSHIELD functions: 
-\code{\link{dsadmin.get_methods}()},
 \code{\link{dsadmin.get_method}()},
+\code{\link{dsadmin.get_methods}()},
 \code{\link{dsadmin.get_options}()},
 \code{\link{dsadmin.install_github_package}()},
 \code{\link{dsadmin.install_local_package}()},
 \code{\link{dsadmin.installed_package}()},
-\code{\link{dsadmin.package_descriptions}()},
 \code{\link{dsadmin.package_description}()},
+\code{\link{dsadmin.package_descriptions}()},
 \code{\link{dsadmin.publish_package}()},
 \code{\link{dsadmin.remove_package}()},
-\code{\link{dsadmin.rm_methods}()},
 \code{\link{dsadmin.rm_method}()},
-\code{\link{dsadmin.rm_options}()},
+\code{\link{dsadmin.rm_methods}()},
 \code{\link{dsadmin.rm_option}()},
+\code{\link{dsadmin.rm_options}()},
 \code{\link{dsadmin.rm_package_methods}()},
 \code{\link{dsadmin.set_method}()},
 \code{\link{dsadmin.set_option}()},
diff --git a/man/dsadmin.installed_package.Rd b/man/dsadmin.installed_package.Rd
index 2dab5eda..a7fec940 100644
--- a/man/dsadmin.installed_package.Rd
+++ b/man/dsadmin.installed_package.Rd
@@ -28,20 +28,20 @@ opal.logout(o)
 }
 \seealso{
 Other DataSHIELD functions: 
-\code{\link{dsadmin.get_methods}()},
 \code{\link{dsadmin.get_method}()},
+\code{\link{dsadmin.get_methods}()},
 \code{\link{dsadmin.get_options}()},
 \code{\link{dsadmin.install_github_package}()},
 \code{\link{dsadmin.install_local_package}()},
 \code{\link{dsadmin.install_package}()},
-\code{\link{dsadmin.package_descriptions}()},
 \code{\link{dsadmin.package_description}()},
+\code{\link{dsadmin.package_descriptions}()},
 \code{\link{dsadmin.publish_package}()},
 \code{\link{dsadmin.remove_package}()},
-\code{\link{dsadmin.rm_methods}()},
 \code{\link{dsadmin.rm_method}()},
-\code{\link{dsadmin.rm_options}()},
+\code{\link{dsadmin.rm_methods}()},
 \code{\link{dsadmin.rm_option}()},
+\code{\link{dsadmin.rm_options}()},
 \code{\link{dsadmin.rm_package_methods}()},
 \code{\link{dsadmin.set_method}()},
 \code{\link{dsadmin.set_option}()},
diff --git a/man/dsadmin.package_description.Rd b/man/dsadmin.package_description.Rd
index fde15dab..25d8b333 100644
--- a/man/dsadmin.package_description.Rd
+++ b/man/dsadmin.package_description.Rd
@@ -28,8 +28,8 @@ opal.logout(o)
 }
 \seealso{
 Other DataSHIELD functions: 
-\code{\link{dsadmin.get_methods}()},
 \code{\link{dsadmin.get_method}()},
+\code{\link{dsadmin.get_methods}()},
 \code{\link{dsadmin.get_options}()},
 \code{\link{dsadmin.install_github_package}()},
 \code{\link{dsadmin.install_local_package}()},
@@ -38,10 +38,10 @@ Other DataSHIELD functions:
 \code{\link{dsadmin.package_descriptions}()},
 \code{\link{dsadmin.publish_package}()},
 \code{\link{dsadmin.remove_package}()},
-\code{\link{dsadmin.rm_methods}()},
 \code{\link{dsadmin.rm_method}()},
-\code{\link{dsadmin.rm_options}()},
+\code{\link{dsadmin.rm_methods}()},
 \code{\link{dsadmin.rm_option}()},
+\code{\link{dsadmin.rm_options}()},
 \code{\link{dsadmin.rm_package_methods}()},
 \code{\link{dsadmin.set_method}()},
 \code{\link{dsadmin.set_option}()},
diff --git a/man/dsadmin.package_descriptions.Rd b/man/dsadmin.package_descriptions.Rd
index cf8ad7ae..d91aac98 100644
--- a/man/dsadmin.package_descriptions.Rd
+++ b/man/dsadmin.package_descriptions.Rd
@@ -31,8 +31,8 @@ opal.logout(o)
 }
 \seealso{
 Other DataSHIELD functions: 
-\code{\link{dsadmin.get_methods}()},
 \code{\link{dsadmin.get_method}()},
+\code{\link{dsadmin.get_methods}()},
 \code{\link{dsadmin.get_options}()},
 \code{\link{dsadmin.install_github_package}()},
 \code{\link{dsadmin.install_local_package}()},
@@ -41,10 +41,10 @@ Other DataSHIELD functions:
 \code{\link{dsadmin.package_description}()},
 \code{\link{dsadmin.publish_package}()},
 \code{\link{dsadmin.remove_package}()},
-\code{\link{dsadmin.rm_methods}()},
 \code{\link{dsadmin.rm_method}()},
-\code{\link{dsadmin.rm_options}()},
+\code{\link{dsadmin.rm_methods}()},
 \code{\link{dsadmin.rm_option}()},
+\code{\link{dsadmin.rm_options}()},
 \code{\link{dsadmin.rm_package_methods}()},
 \code{\link{dsadmin.set_method}()},
 \code{\link{dsadmin.set_option}()},
diff --git a/man/dsadmin.profile.Rd b/man/dsadmin.profile.Rd
index 153a9a89..438c4e58 100644
--- a/man/dsadmin.profile.Rd
+++ b/man/dsadmin.profile.Rd
@@ -31,9 +31,9 @@ Other DataSHIELD profiles:
 \code{\link{dsadmin.profile_enable}()},
 \code{\link{dsadmin.profile_exists}()},
 \code{\link{dsadmin.profile_init}()},
+\code{\link{dsadmin.profile_perm}()},
 \code{\link{dsadmin.profile_perm_add}()},
 \code{\link{dsadmin.profile_perm_delete}()},
-\code{\link{dsadmin.profile_perm}()},
 \code{\link{dsadmin.profile_rparser}()},
 \code{\link{dsadmin.profiles}()}
 }
diff --git a/man/dsadmin.profile_access.Rd b/man/dsadmin.profile_access.Rd
index 4d12aeb3..65a198ad 100644
--- a/man/dsadmin.profile_access.Rd
+++ b/man/dsadmin.profile_access.Rd
@@ -28,16 +28,16 @@ opal.logout(o)
 }
 \seealso{
 Other DataSHIELD profiles: 
+\code{\link{dsadmin.profile}()},
 \code{\link{dsadmin.profile_create}()},
 \code{\link{dsadmin.profile_delete}()},
 \code{\link{dsadmin.profile_enable}()},
 \code{\link{dsadmin.profile_exists}()},
 \code{\link{dsadmin.profile_init}()},
+\code{\link{dsadmin.profile_perm}()},
 \code{\link{dsadmin.profile_perm_add}()},
 \code{\link{dsadmin.profile_perm_delete}()},
-\code{\link{dsadmin.profile_perm}()},
 \code{\link{dsadmin.profile_rparser}()},
-\code{\link{dsadmin.profiles}()},
-\code{\link{dsadmin.profile}()}
+\code{\link{dsadmin.profiles}()}
 }
 \concept{DataSHIELD profiles}
diff --git a/man/dsadmin.profile_create.Rd b/man/dsadmin.profile_create.Rd
index 78a9e560..c8e10f85 100644
--- a/man/dsadmin.profile_create.Rd
+++ b/man/dsadmin.profile_create.Rd
@@ -28,16 +28,16 @@ opal.logout(o)
 }
 \seealso{
 Other DataSHIELD profiles: 
+\code{\link{dsadmin.profile}()},
 \code{\link{dsadmin.profile_access}()},
 \code{\link{dsadmin.profile_delete}()},
 \code{\link{dsadmin.profile_enable}()},
 \code{\link{dsadmin.profile_exists}()},
 \code{\link{dsadmin.profile_init}()},
+\code{\link{dsadmin.profile_perm}()},
 \code{\link{dsadmin.profile_perm_add}()},
 \code{\link{dsadmin.profile_perm_delete}()},
-\code{\link{dsadmin.profile_perm}()},
 \code{\link{dsadmin.profile_rparser}()},
-\code{\link{dsadmin.profiles}()},
-\code{\link{dsadmin.profile}()}
+\code{\link{dsadmin.profiles}()}
 }
 \concept{DataSHIELD profiles}
diff --git a/man/dsadmin.profile_delete.Rd b/man/dsadmin.profile_delete.Rd
index 039c7a1a..419d56e4 100644
--- a/man/dsadmin.profile_delete.Rd
+++ b/man/dsadmin.profile_delete.Rd
@@ -24,16 +24,16 @@ opal.logout(o)
 }
 \seealso{
 Other DataSHIELD profiles: 
+\code{\link{dsadmin.profile}()},
 \code{\link{dsadmin.profile_access}()},
 \code{\link{dsadmin.profile_create}()},
 \code{\link{dsadmin.profile_enable}()},
 \code{\link{dsadmin.profile_exists}()},
 \code{\link{dsadmin.profile_init}()},
+\code{\link{dsadmin.profile_perm}()},
 \code{\link{dsadmin.profile_perm_add}()},
 \code{\link{dsadmin.profile_perm_delete}()},
-\code{\link{dsadmin.profile_perm}()},
 \code{\link{dsadmin.profile_rparser}()},
-\code{\link{dsadmin.profiles}()},
-\code{\link{dsadmin.profile}()}
+\code{\link{dsadmin.profiles}()}
 }
 \concept{DataSHIELD profiles}
diff --git a/man/dsadmin.profile_enable.Rd b/man/dsadmin.profile_enable.Rd
index af0ddbd1..806d2aba 100644
--- a/man/dsadmin.profile_enable.Rd
+++ b/man/dsadmin.profile_enable.Rd
@@ -26,16 +26,16 @@ opal.logout(o)
 }
 \seealso{
 Other DataSHIELD profiles: 
+\code{\link{dsadmin.profile}()},
 \code{\link{dsadmin.profile_access}()},
 \code{\link{dsadmin.profile_create}()},
 \code{\link{dsadmin.profile_delete}()},
 \code{\link{dsadmin.profile_exists}()},
 \code{\link{dsadmin.profile_init}()},
+\code{\link{dsadmin.profile_perm}()},
 \code{\link{dsadmin.profile_perm_add}()},
 \code{\link{dsadmin.profile_perm_delete}()},
-\code{\link{dsadmin.profile_perm}()},
 \code{\link{dsadmin.profile_rparser}()},
-\code{\link{dsadmin.profiles}()},
-\code{\link{dsadmin.profile}()}
+\code{\link{dsadmin.profiles}()}
 }
 \concept{DataSHIELD profiles}
diff --git a/man/dsadmin.profile_exists.Rd b/man/dsadmin.profile_exists.Rd
index 2f5ffd73..07fa4c71 100644
--- a/man/dsadmin.profile_exists.Rd
+++ b/man/dsadmin.profile_exists.Rd
@@ -24,16 +24,16 @@ opal.logout(o)
 }
 \seealso{
 Other DataSHIELD profiles: 
+\code{\link{dsadmin.profile}()},
 \code{\link{dsadmin.profile_access}()},
 \code{\link{dsadmin.profile_create}()},
 \code{\link{dsadmin.profile_delete}()},
 \code{\link{dsadmin.profile_enable}()},
 \code{\link{dsadmin.profile_init}()},
+\code{\link{dsadmin.profile_perm}()},
 \code{\link{dsadmin.profile_perm_add}()},
 \code{\link{dsadmin.profile_perm_delete}()},
-\code{\link{dsadmin.profile_perm}()},
 \code{\link{dsadmin.profile_rparser}()},
-\code{\link{dsadmin.profiles}()},
-\code{\link{dsadmin.profile}()}
+\code{\link{dsadmin.profiles}()}
 }
 \concept{DataSHIELD profiles}
diff --git a/man/dsadmin.profile_init.Rd b/man/dsadmin.profile_init.Rd
index a36d7081..e7d3efcc 100644
--- a/man/dsadmin.profile_init.Rd
+++ b/man/dsadmin.profile_init.Rd
@@ -28,16 +28,16 @@ opal.logout(o)
 }
 \seealso{
 Other DataSHIELD profiles: 
+\code{\link{dsadmin.profile}()},
 \code{\link{dsadmin.profile_access}()},
 \code{\link{dsadmin.profile_create}()},
 \code{\link{dsadmin.profile_delete}()},
 \code{\link{dsadmin.profile_enable}()},
 \code{\link{dsadmin.profile_exists}()},
+\code{\link{dsadmin.profile_perm}()},
 \code{\link{dsadmin.profile_perm_add}()},
 \code{\link{dsadmin.profile_perm_delete}()},
-\code{\link{dsadmin.profile_perm}()},
 \code{\link{dsadmin.profile_rparser}()},
-\code{\link{dsadmin.profiles}()},
-\code{\link{dsadmin.profile}()}
+\code{\link{dsadmin.profiles}()}
 }
 \concept{DataSHIELD profiles}
diff --git a/man/dsadmin.profile_perm.Rd b/man/dsadmin.profile_perm.Rd
index 5c60e690..f4ae4105 100644
--- a/man/dsadmin.profile_perm.Rd
+++ b/man/dsadmin.profile_perm.Rd
@@ -28,6 +28,7 @@ opal.logout(o)
 }
 \seealso{
 Other DataSHIELD profiles: 
+\code{\link{dsadmin.profile}()},
 \code{\link{dsadmin.profile_access}()},
 \code{\link{dsadmin.profile_create}()},
 \code{\link{dsadmin.profile_delete}()},
@@ -37,7 +38,6 @@ Other DataSHIELD profiles:
 \code{\link{dsadmin.profile_perm_add}()},
 \code{\link{dsadmin.profile_perm_delete}()},
 \code{\link{dsadmin.profile_rparser}()},
-\code{\link{dsadmin.profiles}()},
-\code{\link{dsadmin.profile}()}
+\code{\link{dsadmin.profiles}()}
 }
 \concept{DataSHIELD profiles}
diff --git a/man/dsadmin.profile_perm_add.Rd b/man/dsadmin.profile_perm_add.Rd
index b7f54fe6..a076c7c5 100644
--- a/man/dsadmin.profile_perm_add.Rd
+++ b/man/dsadmin.profile_perm_add.Rd
@@ -38,16 +38,16 @@ opal.logout(o)
 }
 \seealso{
 Other DataSHIELD profiles: 
+\code{\link{dsadmin.profile}()},
 \code{\link{dsadmin.profile_access}()},
 \code{\link{dsadmin.profile_create}()},
 \code{\link{dsadmin.profile_delete}()},
 \code{\link{dsadmin.profile_enable}()},
 \code{\link{dsadmin.profile_exists}()},
 \code{\link{dsadmin.profile_init}()},
-\code{\link{dsadmin.profile_perm_delete}()},
 \code{\link{dsadmin.profile_perm}()},
+\code{\link{dsadmin.profile_perm_delete}()},
 \code{\link{dsadmin.profile_rparser}()},
-\code{\link{dsadmin.profiles}()},
-\code{\link{dsadmin.profile}()}
+\code{\link{dsadmin.profiles}()}
 }
 \concept{DataSHIELD profiles}
diff --git a/man/dsadmin.profile_perm_delete.Rd b/man/dsadmin.profile_perm_delete.Rd
index daed5134..dcfe997a 100644
--- a/man/dsadmin.profile_perm_delete.Rd
+++ b/man/dsadmin.profile_perm_delete.Rd
@@ -29,16 +29,16 @@ opal.logout(o)
 }
 \seealso{
 Other DataSHIELD profiles: 
+\code{\link{dsadmin.profile}()},
 \code{\link{dsadmin.profile_access}()},
 \code{\link{dsadmin.profile_create}()},
 \code{\link{dsadmin.profile_delete}()},
 \code{\link{dsadmin.profile_enable}()},
 \code{\link{dsadmin.profile_exists}()},
 \code{\link{dsadmin.profile_init}()},
-\code{\link{dsadmin.profile_perm_add}()},
 \code{\link{dsadmin.profile_perm}()},
+\code{\link{dsadmin.profile_perm_add}()},
 \code{\link{dsadmin.profile_rparser}()},
-\code{\link{dsadmin.profiles}()},
-\code{\link{dsadmin.profile}()}
+\code{\link{dsadmin.profiles}()}
 }
 \concept{DataSHIELD profiles}
diff --git a/man/dsadmin.profile_rparser.Rd b/man/dsadmin.profile_rparser.Rd
index fa9f4a4c..ae231d5f 100644
--- a/man/dsadmin.profile_rparser.Rd
+++ b/man/dsadmin.profile_rparser.Rd
@@ -30,16 +30,16 @@ opal.logout(o)
 }
 \seealso{
 Other DataSHIELD profiles: 
+\code{\link{dsadmin.profile}()},
 \code{\link{dsadmin.profile_access}()},
 \code{\link{dsadmin.profile_create}()},
 \code{\link{dsadmin.profile_delete}()},
 \code{\link{dsadmin.profile_enable}()},
 \code{\link{dsadmin.profile_exists}()},
 \code{\link{dsadmin.profile_init}()},
+\code{\link{dsadmin.profile_perm}()},
 \code{\link{dsadmin.profile_perm_add}()},
 \code{\link{dsadmin.profile_perm_delete}()},
-\code{\link{dsadmin.profile_perm}()},
-\code{\link{dsadmin.profiles}()},
-\code{\link{dsadmin.profile}()}
+\code{\link{dsadmin.profiles}()}
 }
 \concept{DataSHIELD profiles}
diff --git a/man/dsadmin.profiles.Rd b/man/dsadmin.profiles.Rd
index 815a3fea..a2094b1a 100644
--- a/man/dsadmin.profiles.Rd
+++ b/man/dsadmin.profiles.Rd
@@ -26,16 +26,16 @@ opal.logout(o)
 }
 \seealso{
 Other DataSHIELD profiles: 
+\code{\link{dsadmin.profile}()},
 \code{\link{dsadmin.profile_access}()},
 \code{\link{dsadmin.profile_create}()},
 \code{\link{dsadmin.profile_delete}()},
 \code{\link{dsadmin.profile_enable}()},
 \code{\link{dsadmin.profile_exists}()},
 \code{\link{dsadmin.profile_init}()},
+\code{\link{dsadmin.profile_perm}()},
 \code{\link{dsadmin.profile_perm_add}()},
 \code{\link{dsadmin.profile_perm_delete}()},
-\code{\link{dsadmin.profile_perm}()},
-\code{\link{dsadmin.profile_rparser}()},
-\code{\link{dsadmin.profile}()}
+\code{\link{dsadmin.profile_rparser}()}
 }
 \concept{DataSHIELD profiles}
diff --git a/man/dsadmin.publish_package.Rd b/man/dsadmin.publish_package.Rd
index bd32b4b3..16489cb8 100644
--- a/man/dsadmin.publish_package.Rd
+++ b/man/dsadmin.publish_package.Rd
@@ -28,20 +28,20 @@ opal.logout(o)
 }
 \seealso{
 Other DataSHIELD functions: 
-\code{\link{dsadmin.get_methods}()},
 \code{\link{dsadmin.get_method}()},
+\code{\link{dsadmin.get_methods}()},
 \code{\link{dsadmin.get_options}()},
 \code{\link{dsadmin.install_github_package}()},
 \code{\link{dsadmin.install_local_package}()},
 \code{\link{dsadmin.install_package}()},
 \code{\link{dsadmin.installed_package}()},
-\code{\link{dsadmin.package_descriptions}()},
 \code{\link{dsadmin.package_description}()},
+\code{\link{dsadmin.package_descriptions}()},
 \code{\link{dsadmin.remove_package}()},
-\code{\link{dsadmin.rm_methods}()},
 \code{\link{dsadmin.rm_method}()},
-\code{\link{dsadmin.rm_options}()},
+\code{\link{dsadmin.rm_methods}()},
 \code{\link{dsadmin.rm_option}()},
+\code{\link{dsadmin.rm_options}()},
 \code{\link{dsadmin.rm_package_methods}()},
 \code{\link{dsadmin.set_method}()},
 \code{\link{dsadmin.set_option}()},
diff --git a/man/dsadmin.remove_package.Rd b/man/dsadmin.remove_package.Rd
index bbec1627..bf6129c5 100644
--- a/man/dsadmin.remove_package.Rd
+++ b/man/dsadmin.remove_package.Rd
@@ -25,20 +25,20 @@ opal.logout(o)
 }
 \seealso{
 Other DataSHIELD functions: 
-\code{\link{dsadmin.get_methods}()},
 \code{\link{dsadmin.get_method}()},
+\code{\link{dsadmin.get_methods}()},
 \code{\link{dsadmin.get_options}()},
 \code{\link{dsadmin.install_github_package}()},
 \code{\link{dsadmin.install_local_package}()},
 \code{\link{dsadmin.install_package}()},
 \code{\link{dsadmin.installed_package}()},
-\code{\link{dsadmin.package_descriptions}()},
 \code{\link{dsadmin.package_description}()},
+\code{\link{dsadmin.package_descriptions}()},
 \code{\link{dsadmin.publish_package}()},
-\code{\link{dsadmin.rm_methods}()},
 \code{\link{dsadmin.rm_method}()},
-\code{\link{dsadmin.rm_options}()},
+\code{\link{dsadmin.rm_methods}()},
 \code{\link{dsadmin.rm_option}()},
+\code{\link{dsadmin.rm_options}()},
 \code{\link{dsadmin.rm_package_methods}()},
 \code{\link{dsadmin.set_method}()},
 \code{\link{dsadmin.set_option}()},
diff --git a/man/dsadmin.rm_method.Rd b/man/dsadmin.rm_method.Rd
index 0a29752a..ba0b45ca 100644
--- a/man/dsadmin.rm_method.Rd
+++ b/man/dsadmin.rm_method.Rd
@@ -27,20 +27,20 @@ opal.logout(o)
 }
 \seealso{
 Other DataSHIELD functions: 
-\code{\link{dsadmin.get_methods}()},
 \code{\link{dsadmin.get_method}()},
+\code{\link{dsadmin.get_methods}()},
 \code{\link{dsadmin.get_options}()},
 \code{\link{dsadmin.install_github_package}()},
 \code{\link{dsadmin.install_local_package}()},
 \code{\link{dsadmin.install_package}()},
 \code{\link{dsadmin.installed_package}()},
-\code{\link{dsadmin.package_descriptions}()},
 \code{\link{dsadmin.package_description}()},
+\code{\link{dsadmin.package_descriptions}()},
 \code{\link{dsadmin.publish_package}()},
 \code{\link{dsadmin.remove_package}()},
 \code{\link{dsadmin.rm_methods}()},
-\code{\link{dsadmin.rm_options}()},
 \code{\link{dsadmin.rm_option}()},
+\code{\link{dsadmin.rm_options}()},
 \code{\link{dsadmin.rm_package_methods}()},
 \code{\link{dsadmin.set_method}()},
 \code{\link{dsadmin.set_option}()},
diff --git a/man/dsadmin.rm_methods.Rd b/man/dsadmin.rm_methods.Rd
index 223f8140..44f393aa 100644
--- a/man/dsadmin.rm_methods.Rd
+++ b/man/dsadmin.rm_methods.Rd
@@ -25,20 +25,20 @@ opal.logout(o)
 }
 \seealso{
 Other DataSHIELD functions: 
-\code{\link{dsadmin.get_methods}()},
 \code{\link{dsadmin.get_method}()},
+\code{\link{dsadmin.get_methods}()},
 \code{\link{dsadmin.get_options}()},
 \code{\link{dsadmin.install_github_package}()},
 \code{\link{dsadmin.install_local_package}()},
 \code{\link{dsadmin.install_package}()},
 \code{\link{dsadmin.installed_package}()},
-\code{\link{dsadmin.package_descriptions}()},
 \code{\link{dsadmin.package_description}()},
+\code{\link{dsadmin.package_descriptions}()},
 \code{\link{dsadmin.publish_package}()},
 \code{\link{dsadmin.remove_package}()},
 \code{\link{dsadmin.rm_method}()},
-\code{\link{dsadmin.rm_options}()},
 \code{\link{dsadmin.rm_option}()},
+\code{\link{dsadmin.rm_options}()},
 \code{\link{dsadmin.rm_package_methods}()},
 \code{\link{dsadmin.set_method}()},
 \code{\link{dsadmin.set_option}()},
diff --git a/man/dsadmin.rm_option.Rd b/man/dsadmin.rm_option.Rd
index d4f029fe..9647c78e 100644
--- a/man/dsadmin.rm_option.Rd
+++ b/man/dsadmin.rm_option.Rd
@@ -25,19 +25,19 @@ opal.logout(o)
 }
 \seealso{
 Other DataSHIELD functions: 
-\code{\link{dsadmin.get_methods}()},
 \code{\link{dsadmin.get_method}()},
+\code{\link{dsadmin.get_methods}()},
 \code{\link{dsadmin.get_options}()},
 \code{\link{dsadmin.install_github_package}()},
 \code{\link{dsadmin.install_local_package}()},
 \code{\link{dsadmin.install_package}()},
 \code{\link{dsadmin.installed_package}()},
-\code{\link{dsadmin.package_descriptions}()},
 \code{\link{dsadmin.package_description}()},
+\code{\link{dsadmin.package_descriptions}()},
 \code{\link{dsadmin.publish_package}()},
 \code{\link{dsadmin.remove_package}()},
-\code{\link{dsadmin.rm_methods}()},
 \code{\link{dsadmin.rm_method}()},
+\code{\link{dsadmin.rm_methods}()},
 \code{\link{dsadmin.rm_options}()},
 \code{\link{dsadmin.rm_package_methods}()},
 \code{\link{dsadmin.set_method}()},
diff --git a/man/dsadmin.rm_options.Rd b/man/dsadmin.rm_options.Rd
index 6452a135..c820e0a1 100644
--- a/man/dsadmin.rm_options.Rd
+++ b/man/dsadmin.rm_options.Rd
@@ -23,19 +23,19 @@ opal.logout(o)
 }
 \seealso{
 Other DataSHIELD functions: 
-\code{\link{dsadmin.get_methods}()},
 \code{\link{dsadmin.get_method}()},
+\code{\link{dsadmin.get_methods}()},
 \code{\link{dsadmin.get_options}()},
 \code{\link{dsadmin.install_github_package}()},
 \code{\link{dsadmin.install_local_package}()},
 \code{\link{dsadmin.install_package}()},
 \code{\link{dsadmin.installed_package}()},
-\code{\link{dsadmin.package_descriptions}()},
 \code{\link{dsadmin.package_description}()},
+\code{\link{dsadmin.package_descriptions}()},
 \code{\link{dsadmin.publish_package}()},
 \code{\link{dsadmin.remove_package}()},
-\code{\link{dsadmin.rm_methods}()},
 \code{\link{dsadmin.rm_method}()},
+\code{\link{dsadmin.rm_methods}()},
 \code{\link{dsadmin.rm_option}()},
 \code{\link{dsadmin.rm_package_methods}()},
 \code{\link{dsadmin.set_method}()},
diff --git a/man/dsadmin.rm_package_methods.Rd b/man/dsadmin.rm_package_methods.Rd
index bede81dc..0ce7bb52 100644
--- a/man/dsadmin.rm_package_methods.Rd
+++ b/man/dsadmin.rm_package_methods.Rd
@@ -27,21 +27,21 @@ opal.logout(o)
 }
 \seealso{
 Other DataSHIELD functions: 
-\code{\link{dsadmin.get_methods}()},
 \code{\link{dsadmin.get_method}()},
+\code{\link{dsadmin.get_methods}()},
 \code{\link{dsadmin.get_options}()},
 \code{\link{dsadmin.install_github_package}()},
 \code{\link{dsadmin.install_local_package}()},
 \code{\link{dsadmin.install_package}()},
 \code{\link{dsadmin.installed_package}()},
-\code{\link{dsadmin.package_descriptions}()},
 \code{\link{dsadmin.package_description}()},
+\code{\link{dsadmin.package_descriptions}()},
 \code{\link{dsadmin.publish_package}()},
 \code{\link{dsadmin.remove_package}()},
-\code{\link{dsadmin.rm_methods}()},
 \code{\link{dsadmin.rm_method}()},
-\code{\link{dsadmin.rm_options}()},
+\code{\link{dsadmin.rm_methods}()},
 \code{\link{dsadmin.rm_option}()},
+\code{\link{dsadmin.rm_options}()},
 \code{\link{dsadmin.set_method}()},
 \code{\link{dsadmin.set_option}()},
 \code{\link{dsadmin.set_package_methods}()},
diff --git a/man/dsadmin.set_method.Rd b/man/dsadmin.set_method.Rd
index 948f243f..d0195c89 100644
--- a/man/dsadmin.set_method.Rd
+++ b/man/dsadmin.set_method.Rd
@@ -41,21 +41,21 @@ opal.logout(o)
 }
 \seealso{
 Other DataSHIELD functions: 
-\code{\link{dsadmin.get_methods}()},
 \code{\link{dsadmin.get_method}()},
+\code{\link{dsadmin.get_methods}()},
 \code{\link{dsadmin.get_options}()},
 \code{\link{dsadmin.install_github_package}()},
 \code{\link{dsadmin.install_local_package}()},
 \code{\link{dsadmin.install_package}()},
 \code{\link{dsadmin.installed_package}()},
-\code{\link{dsadmin.package_descriptions}()},
 \code{\link{dsadmin.package_description}()},
+\code{\link{dsadmin.package_descriptions}()},
 \code{\link{dsadmin.publish_package}()},
 \code{\link{dsadmin.remove_package}()},
-\code{\link{dsadmin.rm_methods}()},
 \code{\link{dsadmin.rm_method}()},
-\code{\link{dsadmin.rm_options}()},
+\code{\link{dsadmin.rm_methods}()},
 \code{\link{dsadmin.rm_option}()},
+\code{\link{dsadmin.rm_options}()},
 \code{\link{dsadmin.rm_package_methods}()},
 \code{\link{dsadmin.set_option}()},
 \code{\link{dsadmin.set_package_methods}()},
diff --git a/man/dsadmin.set_option.Rd b/man/dsadmin.set_option.Rd
index 368b4c60..a1d354f1 100644
--- a/man/dsadmin.set_option.Rd
+++ b/man/dsadmin.set_option.Rd
@@ -27,21 +27,21 @@ opal.logout(o)
 }
 \seealso{
 Other DataSHIELD functions: 
-\code{\link{dsadmin.get_methods}()},
 \code{\link{dsadmin.get_method}()},
+\code{\link{dsadmin.get_methods}()},
 \code{\link{dsadmin.get_options}()},
 \code{\link{dsadmin.install_github_package}()},
 \code{\link{dsadmin.install_local_package}()},
 \code{\link{dsadmin.install_package}()},
 \code{\link{dsadmin.installed_package}()},
-\code{\link{dsadmin.package_descriptions}()},
 \code{\link{dsadmin.package_description}()},
+\code{\link{dsadmin.package_descriptions}()},
 \code{\link{dsadmin.publish_package}()},
 \code{\link{dsadmin.remove_package}()},
-\code{\link{dsadmin.rm_methods}()},
 \code{\link{dsadmin.rm_method}()},
-\code{\link{dsadmin.rm_options}()},
+\code{\link{dsadmin.rm_methods}()},
 \code{\link{dsadmin.rm_option}()},
+\code{\link{dsadmin.rm_options}()},
 \code{\link{dsadmin.rm_package_methods}()},
 \code{\link{dsadmin.set_method}()},
 \code{\link{dsadmin.set_package_methods}()},
diff --git a/man/dsadmin.set_package_methods.Rd b/man/dsadmin.set_package_methods.Rd
index ac8238e6..62574d75 100644
--- a/man/dsadmin.set_package_methods.Rd
+++ b/man/dsadmin.set_package_methods.Rd
@@ -30,21 +30,21 @@ opal.logout(o)
 }
 \seealso{
 Other DataSHIELD functions: 
-\code{\link{dsadmin.get_methods}()},
 \code{\link{dsadmin.get_method}()},
+\code{\link{dsadmin.get_methods}()},
 \code{\link{dsadmin.get_options}()},
 \code{\link{dsadmin.install_github_package}()},
 \code{\link{dsadmin.install_local_package}()},
 \code{\link{dsadmin.install_package}()},
 \code{\link{dsadmin.installed_package}()},
-\code{\link{dsadmin.package_descriptions}()},
 \code{\link{dsadmin.package_description}()},
+\code{\link{dsadmin.package_descriptions}()},
 \code{\link{dsadmin.publish_package}()},
 \code{\link{dsadmin.remove_package}()},
-\code{\link{dsadmin.rm_methods}()},
 \code{\link{dsadmin.rm_method}()},
-\code{\link{dsadmin.rm_options}()},
+\code{\link{dsadmin.rm_methods}()},
 \code{\link{dsadmin.rm_option}()},
+\code{\link{dsadmin.rm_options}()},
 \code{\link{dsadmin.rm_package_methods}()},
 \code{\link{dsadmin.set_method}()},
 \code{\link{dsadmin.set_option}()},
diff --git a/man/dsadmin.unpublish_package.Rd b/man/dsadmin.unpublish_package.Rd
index e439210c..6ca47215 100644
--- a/man/dsadmin.unpublish_package.Rd
+++ b/man/dsadmin.unpublish_package.Rd
@@ -28,21 +28,21 @@ opal.logout(o)
 }
 \seealso{
 Other DataSHIELD functions: 
-\code{\link{dsadmin.get_methods}()},
 \code{\link{dsadmin.get_method}()},
+\code{\link{dsadmin.get_methods}()},
 \code{\link{dsadmin.get_options}()},
 \code{\link{dsadmin.install_github_package}()},
 \code{\link{dsadmin.install_local_package}()},
 \code{\link{dsadmin.install_package}()},
 \code{\link{dsadmin.installed_package}()},
-\code{\link{dsadmin.package_descriptions}()},
 \code{\link{dsadmin.package_description}()},
+\code{\link{dsadmin.package_descriptions}()},
 \code{\link{dsadmin.publish_package}()},
 \code{\link{dsadmin.remove_package}()},
-\code{\link{dsadmin.rm_methods}()},
 \code{\link{dsadmin.rm_method}()},
-\code{\link{dsadmin.rm_options}()},
+\code{\link{dsadmin.rm_methods}()},
 \code{\link{dsadmin.rm_option}()},
+\code{\link{dsadmin.rm_options}()},
 \code{\link{dsadmin.rm_package_methods}()},
 \code{\link{dsadmin.set_method}()},
 \code{\link{dsadmin.set_option}()},
diff --git a/man/oadmin.install_bioconductor_package.Rd b/man/oadmin.install_bioconductor_package.Rd
index 814794b0..a345ff88 100644
--- a/man/oadmin.install_bioconductor_package.Rd
+++ b/man/oadmin.install_bioconductor_package.Rd
@@ -31,8 +31,8 @@ Other administration functions:
 \code{\link{oadmin.install_local_package}()},
 \code{\link{oadmin.install_package}()},
 \code{\link{oadmin.installed_devtools}()},
-\code{\link{oadmin.installed_packages}()},
 \code{\link{oadmin.installed_package}()},
+\code{\link{oadmin.installed_packages}()},
 \code{\link{oadmin.package_description}()},
 \code{\link{oadmin.remove_package}()}
 }
diff --git a/man/oadmin.install_cran_package.Rd b/man/oadmin.install_cran_package.Rd
index da2f23b9..320d98d6 100644
--- a/man/oadmin.install_cran_package.Rd
+++ b/man/oadmin.install_cran_package.Rd
@@ -31,8 +31,8 @@ Other administration functions:
 \code{\link{oadmin.install_local_package}()},
 \code{\link{oadmin.install_package}()},
 \code{\link{oadmin.installed_devtools}()},
-\code{\link{oadmin.installed_packages}()},
 \code{\link{oadmin.installed_package}()},
+\code{\link{oadmin.installed_packages}()},
 \code{\link{oadmin.package_description}()},
 \code{\link{oadmin.remove_package}()}
 }
diff --git a/man/oadmin.install_devtools.Rd b/man/oadmin.install_devtools.Rd
index 9b31c8be..bd43c4a6 100644
--- a/man/oadmin.install_devtools.Rd
+++ b/man/oadmin.install_devtools.Rd
@@ -29,8 +29,8 @@ Other administration functions:
 \code{\link{oadmin.install_local_package}()},
 \code{\link{oadmin.install_package}()},
 \code{\link{oadmin.installed_devtools}()},
-\code{\link{oadmin.installed_packages}()},
 \code{\link{oadmin.installed_package}()},
+\code{\link{oadmin.installed_packages}()},
 \code{\link{oadmin.package_description}()},
 \code{\link{oadmin.remove_package}()}
 }
diff --git a/man/oadmin.install_github_package.Rd b/man/oadmin.install_github_package.Rd
index 86ee1433..3a875cd9 100644
--- a/man/oadmin.install_github_package.Rd
+++ b/man/oadmin.install_github_package.Rd
@@ -41,8 +41,8 @@ Other administration functions:
 \code{\link{oadmin.install_local_package}()},
 \code{\link{oadmin.install_package}()},
 \code{\link{oadmin.installed_devtools}()},
-\code{\link{oadmin.installed_packages}()},
 \code{\link{oadmin.installed_package}()},
+\code{\link{oadmin.installed_packages}()},
 \code{\link{oadmin.package_description}()},
 \code{\link{oadmin.remove_package}()}
 }
diff --git a/man/oadmin.install_local_package.Rd b/man/oadmin.install_local_package.Rd
index a28336c9..2fd260ae 100644
--- a/man/oadmin.install_local_package.Rd
+++ b/man/oadmin.install_local_package.Rd
@@ -35,8 +35,8 @@ Other administration functions:
 \code{\link{oadmin.install_github_package}()},
 \code{\link{oadmin.install_package}()},
 \code{\link{oadmin.installed_devtools}()},
-\code{\link{oadmin.installed_packages}()},
 \code{\link{oadmin.installed_package}()},
+\code{\link{oadmin.installed_packages}()},
 \code{\link{oadmin.package_description}()},
 \code{\link{oadmin.remove_package}()}
 }
diff --git a/man/oadmin.install_package.Rd b/man/oadmin.install_package.Rd
index 6c8a95b8..dc60569d 100644
--- a/man/oadmin.install_package.Rd
+++ b/man/oadmin.install_package.Rd
@@ -36,8 +36,8 @@ Other administration functions:
 \code{\link{oadmin.install_github_package}()},
 \code{\link{oadmin.install_local_package}()},
 \code{\link{oadmin.installed_devtools}()},
-\code{\link{oadmin.installed_packages}()},
 \code{\link{oadmin.installed_package}()},
+\code{\link{oadmin.installed_packages}()},
 \code{\link{oadmin.package_description}()},
 \code{\link{oadmin.remove_package}()}
 }
diff --git a/man/oadmin.installed_devtools.Rd b/man/oadmin.installed_devtools.Rd
index 0a877a96..cab9dabe 100644
--- a/man/oadmin.installed_devtools.Rd
+++ b/man/oadmin.installed_devtools.Rd
@@ -29,8 +29,8 @@ Other administration functions:
 \code{\link{oadmin.install_github_package}()},
 \code{\link{oadmin.install_local_package}()},
 \code{\link{oadmin.install_package}()},
-\code{\link{oadmin.installed_packages}()},
 \code{\link{oadmin.installed_package}()},
+\code{\link{oadmin.installed_packages}()},
 \code{\link{oadmin.package_description}()},
 \code{\link{oadmin.remove_package}()}
 }
diff --git a/man/oadmin.package_description.Rd b/man/oadmin.package_description.Rd
index 6a4affcd..59388bd9 100644
--- a/man/oadmin.package_description.Rd
+++ b/man/oadmin.package_description.Rd
@@ -34,8 +34,8 @@ Other administration functions:
 \code{\link{oadmin.install_local_package}()},
 \code{\link{oadmin.install_package}()},
 \code{\link{oadmin.installed_devtools}()},
-\code{\link{oadmin.installed_packages}()},
 \code{\link{oadmin.installed_package}()},
+\code{\link{oadmin.installed_packages}()},
 \code{\link{oadmin.remove_package}()}
 }
 \concept{administration functions}
diff --git a/man/oadmin.remove_package.Rd b/man/oadmin.remove_package.Rd
index f585abd4..1e61c884 100644
--- a/man/oadmin.remove_package.Rd
+++ b/man/oadmin.remove_package.Rd
@@ -32,8 +32,8 @@ Other administration functions:
 \code{\link{oadmin.install_local_package}()},
 \code{\link{oadmin.install_package}()},
 \code{\link{oadmin.installed_devtools}()},
-\code{\link{oadmin.installed_packages}()},
 \code{\link{oadmin.installed_package}()},
+\code{\link{oadmin.installed_packages}()},
 \code{\link{oadmin.package_description}()}
 }
 \concept{administration functions}
diff --git a/man/opal.annotate.Rd b/man/opal.annotate.Rd
index a5b34770..05072176 100644
--- a/man/opal.annotate.Rd
+++ b/man/opal.annotate.Rd
@@ -33,13 +33,13 @@ opal.logout(o)
 Other datasource functions: 
 \code{\link{opal.annotations}()},
 \code{\link{opal.attribute_values}()},
-\code{\link{opal.datasources}()},
 \code{\link{opal.datasource}()},
-\code{\link{opal.tables}()},
+\code{\link{opal.datasources}()},
 \code{\link{opal.table}()},
+\code{\link{opal.tables}()},
 \code{\link{opal.valueset}()},
+\code{\link{opal.variable}()},
 \code{\link{opal.variable_summary}()},
-\code{\link{opal.variables}()},
-\code{\link{opal.variable}()}
+\code{\link{opal.variables}()}
 }
 \concept{datasource functions}
diff --git a/man/opal.annotations.Rd b/man/opal.annotations.Rd
index cc14e0e4..c006ddce 100644
--- a/man/opal.annotations.Rd
+++ b/man/opal.annotations.Rd
@@ -30,13 +30,13 @@ opal.logout(o)
 Other datasource functions: 
 \code{\link{opal.annotate}()},
 \code{\link{opal.attribute_values}()},
-\code{\link{opal.datasources}()},
 \code{\link{opal.datasource}()},
-\code{\link{opal.tables}()},
+\code{\link{opal.datasources}()},
 \code{\link{opal.table}()},
+\code{\link{opal.tables}()},
 \code{\link{opal.valueset}()},
+\code{\link{opal.variable}()},
 \code{\link{opal.variable_summary}()},
-\code{\link{opal.variables}()},
-\code{\link{opal.variable}()}
+\code{\link{opal.variables}()}
 }
 \concept{datasource functions}
diff --git a/man/opal.assign.Rd b/man/opal.assign.Rd
index 46ef3ed2..7e289d35 100644
--- a/man/opal.assign.Rd
+++ b/man/opal.assign.Rd
@@ -60,7 +60,7 @@ Other assignment functions:
 \code{\link{opal.assign.data}()},
 \code{\link{opal.assign.resource}()},
 \code{\link{opal.assign.script}()},
-\code{\link{opal.assign.table.tibble}()},
-\code{\link{opal.assign.table}()}
+\code{\link{opal.assign.table}()},
+\code{\link{opal.assign.table.tibble}()}
 }
 \concept{assignment functions}
diff --git a/man/opal.assign.data.Rd b/man/opal.assign.data.Rd
index 1c72cead..5365ed13 100644
--- a/man/opal.assign.data.Rd
+++ b/man/opal.assign.data.Rd
@@ -32,10 +32,10 @@ opal.logout(o)
 }
 \seealso{
 Other assignment functions: 
+\code{\link{opal.assign}()},
 \code{\link{opal.assign.resource}()},
 \code{\link{opal.assign.script}()},
-\code{\link{opal.assign.table.tibble}()},
 \code{\link{opal.assign.table}()},
-\code{\link{opal.assign}()}
+\code{\link{opal.assign.table.tibble}()}
 }
 \concept{assignment functions}
diff --git a/man/opal.assign.resource.Rd b/man/opal.assign.resource.Rd
index 45ab6008..97db231c 100644
--- a/man/opal.assign.resource.Rd
+++ b/man/opal.assign.resource.Rd
@@ -29,10 +29,10 @@ opal.logout(o)
 }
 \seealso{
 Other assignment functions: 
+\code{\link{opal.assign}()},
 \code{\link{opal.assign.data}()},
 \code{\link{opal.assign.script}()},
-\code{\link{opal.assign.table.tibble}()},
 \code{\link{opal.assign.table}()},
-\code{\link{opal.assign}()}
+\code{\link{opal.assign.table.tibble}()}
 }
 \concept{assignment functions}
diff --git a/man/opal.assign.script.Rd b/man/opal.assign.script.Rd
index 9653dc1a..8b256694 100644
--- a/man/opal.assign.script.Rd
+++ b/man/opal.assign.script.Rd
@@ -29,10 +29,10 @@ opal.logout(o)
 }
 \seealso{
 Other assignment functions: 
+\code{\link{opal.assign}()},
 \code{\link{opal.assign.data}()},
 \code{\link{opal.assign.resource}()},
-\code{\link{opal.assign.table.tibble}()},
 \code{\link{opal.assign.table}()},
-\code{\link{opal.assign}()}
+\code{\link{opal.assign.table.tibble}()}
 }
 \concept{assignment functions}
diff --git a/man/opal.assign.table.Rd b/man/opal.assign.table.Rd
index e471ac24..ba40e107 100644
--- a/man/opal.assign.table.Rd
+++ b/man/opal.assign.table.Rd
@@ -58,10 +58,10 @@ opal.logout(o)
 }
 \seealso{
 Other assignment functions: 
+\code{\link{opal.assign}()},
 \code{\link{opal.assign.data}()},
 \code{\link{opal.assign.resource}()},
 \code{\link{opal.assign.script}()},
-\code{\link{opal.assign.table.tibble}()},
-\code{\link{opal.assign}()}
+\code{\link{opal.assign.table.tibble}()}
 }
 \concept{assignment functions}
diff --git a/man/opal.assign.table.tibble.Rd b/man/opal.assign.table.tibble.Rd
index fe60855d..c7d4618c 100644
--- a/man/opal.assign.table.tibble.Rd
+++ b/man/opal.assign.table.tibble.Rd
@@ -52,10 +52,10 @@ opal.logout(o)
 }
 \seealso{
 Other assignment functions: 
+\code{\link{opal.assign}()},
 \code{\link{opal.assign.data}()},
 \code{\link{opal.assign.resource}()},
 \code{\link{opal.assign.script}()},
-\code{\link{opal.assign.table}()},
-\code{\link{opal.assign}()}
+\code{\link{opal.assign.table}()}
 }
 \concept{assignment functions}
diff --git a/man/opal.attribute_values.Rd b/man/opal.attribute_values.Rd
index 8826b8bd..457c483e 100644
--- a/man/opal.attribute_values.Rd
+++ b/man/opal.attribute_values.Rd
@@ -28,13 +28,13 @@ opal.logout(o)
 Other datasource functions: 
 \code{\link{opal.annotate}()},
 \code{\link{opal.annotations}()},
-\code{\link{opal.datasources}()},
 \code{\link{opal.datasource}()},
-\code{\link{opal.tables}()},
+\code{\link{opal.datasources}()},
 \code{\link{opal.table}()},
+\code{\link{opal.tables}()},
 \code{\link{opal.valueset}()},
+\code{\link{opal.variable}()},
 \code{\link{opal.variable_summary}()},
-\code{\link{opal.variables}()},
-\code{\link{opal.variable}()}
+\code{\link{opal.variables}()}
 }
 \concept{datasource functions}
diff --git a/man/opal.command.Rd b/man/opal.command.Rd
index 7b66b5c5..fe0d3afb 100644
--- a/man/opal.command.Rd
+++ b/man/opal.command.Rd
@@ -27,7 +27,7 @@ opal.logout(o)
 Other command functions: 
 \code{\link{opal.command_result}()},
 \code{\link{opal.command_rm}()},
-\code{\link{opal.commands_rm}()},
-\code{\link{opal.commands}()}
+\code{\link{opal.commands}()},
+\code{\link{opal.commands_rm}()}
 }
 \concept{command functions}
diff --git a/man/opal.command_result.Rd b/man/opal.command_result.Rd
index 6c95a0a5..57ce0ea9 100644
--- a/man/opal.command_result.Rd
+++ b/man/opal.command_result.Rd
@@ -26,9 +26,9 @@ opal.logout(o)
 }
 \seealso{
 Other command functions: 
+\code{\link{opal.command}()},
 \code{\link{opal.command_rm}()},
-\code{\link{opal.commands_rm}()},
 \code{\link{opal.commands}()},
-\code{\link{opal.command}()}
+\code{\link{opal.commands_rm}()}
 }
 \concept{command functions}
diff --git a/man/opal.command_rm.Rd b/man/opal.command_rm.Rd
index 0e9a2c32..80728139 100644
--- a/man/opal.command_rm.Rd
+++ b/man/opal.command_rm.Rd
@@ -23,9 +23,9 @@ opal.logout(o)
 }
 \seealso{
 Other command functions: 
+\code{\link{opal.command}()},
 \code{\link{opal.command_result}()},
-\code{\link{opal.commands_rm}()},
 \code{\link{opal.commands}()},
-\code{\link{opal.command}()}
+\code{\link{opal.commands_rm}()}
 }
 \concept{command functions}
diff --git a/man/opal.commands.Rd b/man/opal.commands.Rd
index 436acc50..2ce455c3 100644
--- a/man/opal.commands.Rd
+++ b/man/opal.commands.Rd
@@ -23,9 +23,9 @@ opal.logout(o)
 }
 \seealso{
 Other command functions: 
+\code{\link{opal.command}()},
 \code{\link{opal.command_result}()},
 \code{\link{opal.command_rm}()},
-\code{\link{opal.commands_rm}()},
-\code{\link{opal.command}()}
+\code{\link{opal.commands_rm}()}
 }
 \concept{command functions}
diff --git a/man/opal.commands_rm.Rd b/man/opal.commands_rm.Rd
index b703f1f0..aeeda02a 100644
--- a/man/opal.commands_rm.Rd
+++ b/man/opal.commands_rm.Rd
@@ -21,9 +21,9 @@ opal.logout(o)
 }
 \seealso{
 Other command functions: 
+\code{\link{opal.command}()},
 \code{\link{opal.command_result}()},
 \code{\link{opal.command_rm}()},
-\code{\link{opal.commands}()},
-\code{\link{opal.command}()}
+\code{\link{opal.commands}()}
 }
 \concept{command functions}
diff --git a/man/opal.datasource.Rd b/man/opal.datasource.Rd
index a4dd493a..816e91cf 100644
--- a/man/opal.datasource.Rd
+++ b/man/opal.datasource.Rd
@@ -27,11 +27,11 @@ Other datasource functions:
 \code{\link{opal.annotations}()},
 \code{\link{opal.attribute_values}()},
 \code{\link{opal.datasources}()},
-\code{\link{opal.tables}()},
 \code{\link{opal.table}()},
+\code{\link{opal.tables}()},
 \code{\link{opal.valueset}()},
+\code{\link{opal.variable}()},
 \code{\link{opal.variable_summary}()},
-\code{\link{opal.variables}()},
-\code{\link{opal.variable}()}
+\code{\link{opal.variables}()}
 }
 \concept{datasource functions}
diff --git a/man/opal.datasources.Rd b/man/opal.datasources.Rd
index 24d3aa4e..f1d10ec0 100644
--- a/man/opal.datasources.Rd
+++ b/man/opal.datasources.Rd
@@ -27,11 +27,11 @@ Other datasource functions:
 \code{\link{opal.annotations}()},
 \code{\link{opal.attribute_values}()},
 \code{\link{opal.datasource}()},
-\code{\link{opal.tables}()},
 \code{\link{opal.table}()},
+\code{\link{opal.tables}()},
 \code{\link{opal.valueset}()},
+\code{\link{opal.variable}()},
 \code{\link{opal.variable_summary}()},
-\code{\link{opal.variables}()},
-\code{\link{opal.variable}()}
+\code{\link{opal.variables}()}
 }
 \concept{datasource functions}
diff --git a/man/opal.file.Rd b/man/opal.file.Rd
index 8fbd6895..f7f99f29 100644
--- a/man/opal.file.Rd
+++ b/man/opal.file.Rd
@@ -28,8 +28,8 @@ Other file functions:
 \code{\link{opal.file_cp}()},
 \code{\link{opal.file_download}()},
 \code{\link{opal.file_ls}()},
-\code{\link{opal.file_mkdir_tmp}()},
 \code{\link{opal.file_mkdir}()},
+\code{\link{opal.file_mkdir_tmp}()},
 \code{\link{opal.file_mv}()},
 \code{\link{opal.file_read}()},
 \code{\link{opal.file_rm}()},
diff --git a/man/opal.file_cp.Rd b/man/opal.file_cp.Rd
index efb3895f..294f1e6e 100644
--- a/man/opal.file_cp.Rd
+++ b/man/opal.file_cp.Rd
@@ -28,16 +28,16 @@ opal.logout(o)
 }
 \seealso{
 Other file functions: 
+\code{\link{opal.file}()},
 \code{\link{opal.file_download}()},
 \code{\link{opal.file_ls}()},
-\code{\link{opal.file_mkdir_tmp}()},
 \code{\link{opal.file_mkdir}()},
+\code{\link{opal.file_mkdir_tmp}()},
 \code{\link{opal.file_mv}()},
 \code{\link{opal.file_read}()},
 \code{\link{opal.file_rm}()},
 \code{\link{opal.file_unzip}()},
 \code{\link{opal.file_upload}()},
-\code{\link{opal.file_write}()},
-\code{\link{opal.file}()}
+\code{\link{opal.file_write}()}
 }
 \concept{file functions}
diff --git a/man/opal.file_download.Rd b/man/opal.file_download.Rd
index 153e6cd2..2f6d030f 100644
--- a/man/opal.file_download.Rd
+++ b/man/opal.file_download.Rd
@@ -35,16 +35,16 @@ opal.logout(o)
 }
 \seealso{
 Other file functions: 
+\code{\link{opal.file}()},
 \code{\link{opal.file_cp}()},
 \code{\link{opal.file_ls}()},
-\code{\link{opal.file_mkdir_tmp}()},
 \code{\link{opal.file_mkdir}()},
+\code{\link{opal.file_mkdir_tmp}()},
 \code{\link{opal.file_mv}()},
 \code{\link{opal.file_read}()},
 \code{\link{opal.file_rm}()},
 \code{\link{opal.file_unzip}()},
 \code{\link{opal.file_upload}()},
-\code{\link{opal.file_write}()},
-\code{\link{opal.file}()}
+\code{\link{opal.file_write}()}
 }
 \concept{file functions}
diff --git a/man/opal.file_ls.Rd b/man/opal.file_ls.Rd
index 1e4abe0f..9713bb6d 100644
--- a/man/opal.file_ls.Rd
+++ b/man/opal.file_ls.Rd
@@ -24,16 +24,16 @@ opal.logout(o)
 }
 \seealso{
 Other file functions: 
+\code{\link{opal.file}()},
 \code{\link{opal.file_cp}()},
 \code{\link{opal.file_download}()},
-\code{\link{opal.file_mkdir_tmp}()},
 \code{\link{opal.file_mkdir}()},
+\code{\link{opal.file_mkdir_tmp}()},
 \code{\link{opal.file_mv}()},
 \code{\link{opal.file_read}()},
 \code{\link{opal.file_rm}()},
 \code{\link{opal.file_unzip}()},
 \code{\link{opal.file_upload}()},
-\code{\link{opal.file_write}()},
-\code{\link{opal.file}()}
+\code{\link{opal.file_write}()}
 }
 \concept{file functions}
diff --git a/man/opal.file_mkdir.Rd b/man/opal.file_mkdir.Rd
index 15b8048b..3924d09a 100644
--- a/man/opal.file_mkdir.Rd
+++ b/man/opal.file_mkdir.Rd
@@ -27,6 +27,7 @@ opal.logout(o)
 }
 \seealso{
 Other file functions: 
+\code{\link{opal.file}()},
 \code{\link{opal.file_cp}()},
 \code{\link{opal.file_download}()},
 \code{\link{opal.file_ls}()},
@@ -36,7 +37,6 @@ Other file functions:
 \code{\link{opal.file_rm}()},
 \code{\link{opal.file_unzip}()},
 \code{\link{opal.file_upload}()},
-\code{\link{opal.file_write}()},
-\code{\link{opal.file}()}
+\code{\link{opal.file_write}()}
 }
 \concept{file functions}
diff --git a/man/opal.file_mkdir_tmp.Rd b/man/opal.file_mkdir_tmp.Rd
index 50d24d1f..644b9adc 100644
--- a/man/opal.file_mkdir_tmp.Rd
+++ b/man/opal.file_mkdir_tmp.Rd
@@ -25,6 +25,7 @@ opal.logout(o)
 }
 \seealso{
 Other file functions: 
+\code{\link{opal.file}()},
 \code{\link{opal.file_cp}()},
 \code{\link{opal.file_download}()},
 \code{\link{opal.file_ls}()},
@@ -34,7 +35,6 @@ Other file functions:
 \code{\link{opal.file_rm}()},
 \code{\link{opal.file_unzip}()},
 \code{\link{opal.file_upload}()},
-\code{\link{opal.file_write}()},
-\code{\link{opal.file}()}
+\code{\link{opal.file_write}()}
 }
 \concept{file functions}
diff --git a/man/opal.file_mv.Rd b/man/opal.file_mv.Rd
index f6e34dba..b26e6d3c 100644
--- a/man/opal.file_mv.Rd
+++ b/man/opal.file_mv.Rd
@@ -32,16 +32,16 @@ opal.logout(o)
 }
 \seealso{
 Other file functions: 
+\code{\link{opal.file}()},
 \code{\link{opal.file_cp}()},
 \code{\link{opal.file_download}()},
 \code{\link{opal.file_ls}()},
-\code{\link{opal.file_mkdir_tmp}()},
 \code{\link{opal.file_mkdir}()},
+\code{\link{opal.file_mkdir_tmp}()},
 \code{\link{opal.file_read}()},
 \code{\link{opal.file_rm}()},
 \code{\link{opal.file_unzip}()},
 \code{\link{opal.file_upload}()},
-\code{\link{opal.file_write}()},
-\code{\link{opal.file}()}
+\code{\link{opal.file_write}()}
 }
 \concept{file functions}
diff --git a/man/opal.file_read.Rd b/man/opal.file_read.Rd
index 65433f40..6bf0ea16 100644
--- a/man/opal.file_read.Rd
+++ b/man/opal.file_read.Rd
@@ -30,16 +30,16 @@ opal.logout(o)
 }
 \seealso{
 Other file functions: 
+\code{\link{opal.file}()},
 \code{\link{opal.file_cp}()},
 \code{\link{opal.file_download}()},
 \code{\link{opal.file_ls}()},
-\code{\link{opal.file_mkdir_tmp}()},
 \code{\link{opal.file_mkdir}()},
+\code{\link{opal.file_mkdir_tmp}()},
 \code{\link{opal.file_mv}()},
 \code{\link{opal.file_rm}()},
 \code{\link{opal.file_unzip}()},
 \code{\link{opal.file_upload}()},
-\code{\link{opal.file_write}()},
-\code{\link{opal.file}()}
+\code{\link{opal.file_write}()}
 }
 \concept{file functions}
diff --git a/man/opal.file_rm.Rd b/man/opal.file_rm.Rd
index a616dbba..14abb146 100644
--- a/man/opal.file_rm.Rd
+++ b/man/opal.file_rm.Rd
@@ -26,16 +26,16 @@ opal.logout(o)
 }
 \seealso{
 Other file functions: 
+\code{\link{opal.file}()},
 \code{\link{opal.file_cp}()},
 \code{\link{opal.file_download}()},
 \code{\link{opal.file_ls}()},
-\code{\link{opal.file_mkdir_tmp}()},
 \code{\link{opal.file_mkdir}()},
+\code{\link{opal.file_mkdir_tmp}()},
 \code{\link{opal.file_mv}()},
 \code{\link{opal.file_read}()},
 \code{\link{opal.file_unzip}()},
 \code{\link{opal.file_upload}()},
-\code{\link{opal.file_write}()},
-\code{\link{opal.file}()}
+\code{\link{opal.file_write}()}
 }
 \concept{file functions}
diff --git a/man/opal.file_unzip.Rd b/man/opal.file_unzip.Rd
index 60eaff21..ce54a435 100644
--- a/man/opal.file_unzip.Rd
+++ b/man/opal.file_unzip.Rd
@@ -31,16 +31,16 @@ opal.logout(o)
 }
 \seealso{
 Other file functions: 
+\code{\link{opal.file}()},
 \code{\link{opal.file_cp}()},
 \code{\link{opal.file_download}()},
 \code{\link{opal.file_ls}()},
-\code{\link{opal.file_mkdir_tmp}()},
 \code{\link{opal.file_mkdir}()},
+\code{\link{opal.file_mkdir_tmp}()},
 \code{\link{opal.file_mv}()},
 \code{\link{opal.file_read}()},
 \code{\link{opal.file_rm}()},
 \code{\link{opal.file_upload}()},
-\code{\link{opal.file_write}()},
-\code{\link{opal.file}()}
+\code{\link{opal.file_write}()}
 }
 \concept{file functions}
diff --git a/man/opal.file_upload.Rd b/man/opal.file_upload.Rd
index 41f2e544..840042f6 100644
--- a/man/opal.file_upload.Rd
+++ b/man/opal.file_upload.Rd
@@ -32,16 +32,16 @@ opal.logout(o)
 }
 \seealso{
 Other file functions: 
+\code{\link{opal.file}()},
 \code{\link{opal.file_cp}()},
 \code{\link{opal.file_download}()},
 \code{\link{opal.file_ls}()},
-\code{\link{opal.file_mkdir_tmp}()},
 \code{\link{opal.file_mkdir}()},
+\code{\link{opal.file_mkdir_tmp}()},
 \code{\link{opal.file_mv}()},
 \code{\link{opal.file_read}()},
 \code{\link{opal.file_rm}()},
 \code{\link{opal.file_unzip}()},
-\code{\link{opal.file_write}()},
-\code{\link{opal.file}()}
+\code{\link{opal.file_write}()}
 }
 \concept{file functions}
diff --git a/man/opal.file_write.Rd b/man/opal.file_write.Rd
index 61a9b33d..b5e546fa 100644
--- a/man/opal.file_write.Rd
+++ b/man/opal.file_write.Rd
@@ -30,16 +30,16 @@ opal.logout(o)
 }
 \seealso{
 Other file functions: 
+\code{\link{opal.file}()},
 \code{\link{opal.file_cp}()},
 \code{\link{opal.file_download}()},
 \code{\link{opal.file_ls}()},
-\code{\link{opal.file_mkdir_tmp}()},
 \code{\link{opal.file_mkdir}()},
+\code{\link{opal.file_mkdir_tmp}()},
 \code{\link{opal.file_mv}()},
 \code{\link{opal.file_read}()},
 \code{\link{opal.file_rm}()},
 \code{\link{opal.file_unzip}()},
-\code{\link{opal.file_upload}()},
-\code{\link{opal.file}()}
+\code{\link{opal.file_upload}()}
 }
 \concept{file functions}
diff --git a/man/opal.load_package.Rd b/man/opal.load_package.Rd
index 510028dc..00f92940 100644
--- a/man/opal.load_package.Rd
+++ b/man/opal.load_package.Rd
@@ -23,8 +23,8 @@ opal.logout(o)
 }
 \seealso{
 Other execution functions: 
-\code{\link{opal.execute.source}()},
 \code{\link{opal.execute}()},
+\code{\link{opal.execute.source}()},
 \code{\link{opal.unload_package}()}
 }
 \concept{execution functions}
diff --git a/man/opal.perms.Rd b/man/opal.perms.Rd
index 972f0b64..0b7e9466 100644
--- a/man/opal.perms.Rd
+++ b/man/opal.perms.Rd
@@ -42,9 +42,9 @@ Other table functions:
 \code{\link{opal.table_export}()},
 \code{\link{opal.table_get}()},
 \code{\link{opal.table_import}()},
+\code{\link{opal.table_perm}()},
 \code{\link{opal.table_perm_add}()},
 \code{\link{opal.table_perm_delete}()},
-\code{\link{opal.table_perm}()},
 \code{\link{opal.table_save}()},
 \code{\link{opal.table_truncate}()},
 \code{\link{opal.table_view_create}()},
diff --git a/man/opal.project.Rd b/man/opal.project.Rd
index c0286326..b82f584f 100644
--- a/man/opal.project.Rd
+++ b/man/opal.project.Rd
@@ -26,7 +26,7 @@ Other project functions:
 \code{\link{opal.project_create}()},
 \code{\link{opal.project_delete}()},
 \code{\link{opal.project_exists}()},
-\code{\link{opal.projects_databases}()},
-\code{\link{opal.projects}()}
+\code{\link{opal.projects}()},
+\code{\link{opal.projects_databases}()}
 }
 \concept{project functions}
diff --git a/man/opal.project_create.Rd b/man/opal.project_create.Rd
index cd84c51e..5ae206c8 100644
--- a/man/opal.project_create.Rd
+++ b/man/opal.project_create.Rd
@@ -48,10 +48,10 @@ opal.logout(o)
 }
 \seealso{
 Other project functions: 
+\code{\link{opal.project}()},
 \code{\link{opal.project_delete}()},
 \code{\link{opal.project_exists}()},
-\code{\link{opal.projects_databases}()},
 \code{\link{opal.projects}()},
-\code{\link{opal.project}()}
+\code{\link{opal.projects_databases}()}
 }
 \concept{project functions}
diff --git a/man/opal.project_delete.Rd b/man/opal.project_delete.Rd
index a2a1d3ad..6c5096bb 100644
--- a/man/opal.project_delete.Rd
+++ b/man/opal.project_delete.Rd
@@ -27,10 +27,10 @@ opal.logout(o)
 }
 \seealso{
 Other project functions: 
+\code{\link{opal.project}()},
 \code{\link{opal.project_create}()},
 \code{\link{opal.project_exists}()},
-\code{\link{opal.projects_databases}()},
 \code{\link{opal.projects}()},
-\code{\link{opal.project}()}
+\code{\link{opal.projects_databases}()}
 }
 \concept{project functions}
diff --git a/man/opal.project_exists.Rd b/man/opal.project_exists.Rd
index b38e87f2..e5a87115 100644
--- a/man/opal.project_exists.Rd
+++ b/man/opal.project_exists.Rd
@@ -26,10 +26,10 @@ opal.logout(o)
 }
 \seealso{
 Other project functions: 
+\code{\link{opal.project}()},
 \code{\link{opal.project_create}()},
 \code{\link{opal.project_delete}()},
-\code{\link{opal.projects_databases}()},
 \code{\link{opal.projects}()},
-\code{\link{opal.project}()}
+\code{\link{opal.projects_databases}()}
 }
 \concept{project functions}
diff --git a/man/opal.projects.Rd b/man/opal.projects.Rd
index 23fe393c..41da692f 100644
--- a/man/opal.projects.Rd
+++ b/man/opal.projects.Rd
@@ -23,10 +23,10 @@ opal.logout(o)
 }
 \seealso{
 Other project functions: 
+\code{\link{opal.project}()},
 \code{\link{opal.project_create}()},
 \code{\link{opal.project_delete}()},
 \code{\link{opal.project_exists}()},
-\code{\link{opal.projects_databases}()},
-\code{\link{opal.project}()}
+\code{\link{opal.projects_databases}()}
 }
 \concept{project functions}
diff --git a/man/opal.projects_databases.Rd b/man/opal.projects_databases.Rd
index ce60819f..a5db4a1a 100644
--- a/man/opal.projects_databases.Rd
+++ b/man/opal.projects_databases.Rd
@@ -24,10 +24,10 @@ opal.logout(o)
 }
 \seealso{
 Other project functions: 
+\code{\link{opal.project}()},
 \code{\link{opal.project_create}()},
 \code{\link{opal.project_delete}()},
 \code{\link{opal.project_exists}()},
-\code{\link{opal.projects}()},
-\code{\link{opal.project}()}
+\code{\link{opal.projects}()}
 }
 \concept{project functions}
diff --git a/man/opal.resource.Rd b/man/opal.resource.Rd
index 231d8fb9..29aac70d 100644
--- a/man/opal.resource.Rd
+++ b/man/opal.resource.Rd
@@ -30,12 +30,12 @@ Other resource functions:
 \code{\link{opal.resource_exists}()},
 \code{\link{opal.resource_extension_create}()},
 \code{\link{opal.resource_get}()},
+\code{\link{opal.resource_perm}()},
 \code{\link{opal.resource_perm_add}()},
 \code{\link{opal.resource_perm_delete}()},
-\code{\link{opal.resource_perm}()},
-\code{\link{opal.resources_perm_add}()},
-\code{\link{opal.resources_perm_delete}()},
+\code{\link{opal.resources}()},
 \code{\link{opal.resources_perm}()},
-\code{\link{opal.resources}()}
+\code{\link{opal.resources_perm_add}()},
+\code{\link{opal.resources_perm_delete}()}
 }
 \concept{resource functions}
diff --git a/man/opal.resource_create.Rd b/man/opal.resource_create.Rd
index 98d42c2b..dbee62c3 100644
--- a/man/opal.resource_create.Rd
+++ b/man/opal.resource_create.Rd
@@ -49,17 +49,17 @@ opal.logout(o)
 }
 \seealso{
 Other resource functions: 
+\code{\link{opal.resource}()},
 \code{\link{opal.resource_delete}()},
 \code{\link{opal.resource_exists}()},
 \code{\link{opal.resource_extension_create}()},
 \code{\link{opal.resource_get}()},
+\code{\link{opal.resource_perm}()},
 \code{\link{opal.resource_perm_add}()},
 \code{\link{opal.resource_perm_delete}()},
-\code{\link{opal.resource_perm}()},
-\code{\link{opal.resources_perm_add}()},
-\code{\link{opal.resources_perm_delete}()},
-\code{\link{opal.resources_perm}()},
 \code{\link{opal.resources}()},
-\code{\link{opal.resource}()}
+\code{\link{opal.resources_perm}()},
+\code{\link{opal.resources_perm_add}()},
+\code{\link{opal.resources_perm_delete}()}
 }
 \concept{resource functions}
diff --git a/man/opal.resource_delete.Rd b/man/opal.resource_delete.Rd
index 8527fe96..71ed47f1 100644
--- a/man/opal.resource_delete.Rd
+++ b/man/opal.resource_delete.Rd
@@ -27,17 +27,17 @@ opal.logout(o)
 }
 \seealso{
 Other resource functions: 
+\code{\link{opal.resource}()},
 \code{\link{opal.resource_create}()},
 \code{\link{opal.resource_exists}()},
 \code{\link{opal.resource_extension_create}()},
 \code{\link{opal.resource_get}()},
+\code{\link{opal.resource_perm}()},
 \code{\link{opal.resource_perm_add}()},
 \code{\link{opal.resource_perm_delete}()},
-\code{\link{opal.resource_perm}()},
-\code{\link{opal.resources_perm_add}()},
-\code{\link{opal.resources_perm_delete}()},
-\code{\link{opal.resources_perm}()},
 \code{\link{opal.resources}()},
-\code{\link{opal.resource}()}
+\code{\link{opal.resources_perm}()},
+\code{\link{opal.resources_perm_add}()},
+\code{\link{opal.resources_perm_delete}()}
 }
 \concept{resource functions}
diff --git a/man/opal.resource_exists.Rd b/man/opal.resource_exists.Rd
index ff98ba0e..3f347c48 100644
--- a/man/opal.resource_exists.Rd
+++ b/man/opal.resource_exists.Rd
@@ -28,17 +28,17 @@ opal.logout(o)
 }
 \seealso{
 Other resource functions: 
+\code{\link{opal.resource}()},
 \code{\link{opal.resource_create}()},
 \code{\link{opal.resource_delete}()},
 \code{\link{opal.resource_extension_create}()},
 \code{\link{opal.resource_get}()},
+\code{\link{opal.resource_perm}()},
 \code{\link{opal.resource_perm_add}()},
 \code{\link{opal.resource_perm_delete}()},
-\code{\link{opal.resource_perm}()},
-\code{\link{opal.resources_perm_add}()},
-\code{\link{opal.resources_perm_delete}()},
-\code{\link{opal.resources_perm}()},
 \code{\link{opal.resources}()},
-\code{\link{opal.resource}()}
+\code{\link{opal.resources_perm}()},
+\code{\link{opal.resources_perm_add}()},
+\code{\link{opal.resources_perm_delete}()}
 }
 \concept{resource functions}
diff --git a/man/opal.resource_extension_create.Rd b/man/opal.resource_extension_create.Rd
index 79912b66..80b964c3 100644
--- a/man/opal.resource_extension_create.Rd
+++ b/man/opal.resource_extension_create.Rd
@@ -54,17 +54,17 @@ opal.logout(o)
 }
 \seealso{
 Other resource functions: 
+\code{\link{opal.resource}()},
 \code{\link{opal.resource_create}()},
 \code{\link{opal.resource_delete}()},
 \code{\link{opal.resource_exists}()},
 \code{\link{opal.resource_get}()},
+\code{\link{opal.resource_perm}()},
 \code{\link{opal.resource_perm_add}()},
 \code{\link{opal.resource_perm_delete}()},
-\code{\link{opal.resource_perm}()},
-\code{\link{opal.resources_perm_add}()},
-\code{\link{opal.resources_perm_delete}()},
-\code{\link{opal.resources_perm}()},
 \code{\link{opal.resources}()},
-\code{\link{opal.resource}()}
+\code{\link{opal.resources_perm}()},
+\code{\link{opal.resources_perm_add}()},
+\code{\link{opal.resources_perm_delete}()}
 }
 \concept{resource functions}
diff --git a/man/opal.resource_get.Rd b/man/opal.resource_get.Rd
index b41596bf..d1c75b53 100644
--- a/man/opal.resource_get.Rd
+++ b/man/opal.resource_get.Rd
@@ -31,17 +31,17 @@ opal.logout(o)
 }
 \seealso{
 Other resource functions: 
+\code{\link{opal.resource}()},
 \code{\link{opal.resource_create}()},
 \code{\link{opal.resource_delete}()},
 \code{\link{opal.resource_exists}()},
 \code{\link{opal.resource_extension_create}()},
+\code{\link{opal.resource_perm}()},
 \code{\link{opal.resource_perm_add}()},
 \code{\link{opal.resource_perm_delete}()},
-\code{\link{opal.resource_perm}()},
-\code{\link{opal.resources_perm_add}()},
-\code{\link{opal.resources_perm_delete}()},
-\code{\link{opal.resources_perm}()},
 \code{\link{opal.resources}()},
-\code{\link{opal.resource}()}
+\code{\link{opal.resources_perm}()},
+\code{\link{opal.resources_perm_add}()},
+\code{\link{opal.resources_perm_delete}()}
 }
 \concept{resource functions}
diff --git a/man/opal.resource_perm.Rd b/man/opal.resource_perm.Rd
index 0b4ff9c1..a62c8c1d 100644
--- a/man/opal.resource_perm.Rd
+++ b/man/opal.resource_perm.Rd
@@ -30,6 +30,7 @@ opal.logout(o)
 }
 \seealso{
 Other resource functions: 
+\code{\link{opal.resource}()},
 \code{\link{opal.resource_create}()},
 \code{\link{opal.resource_delete}()},
 \code{\link{opal.resource_exists}()},
@@ -37,10 +38,9 @@ Other resource functions:
 \code{\link{opal.resource_get}()},
 \code{\link{opal.resource_perm_add}()},
 \code{\link{opal.resource_perm_delete}()},
-\code{\link{opal.resources_perm_add}()},
-\code{\link{opal.resources_perm_delete}()},
-\code{\link{opal.resources_perm}()},
 \code{\link{opal.resources}()},
-\code{\link{opal.resource}()}
+\code{\link{opal.resources_perm}()},
+\code{\link{opal.resources_perm_add}()},
+\code{\link{opal.resources_perm_delete}()}
 }
 \concept{resource functions}
diff --git a/man/opal.resource_perm_add.Rd b/man/opal.resource_perm_add.Rd
index f344f199..defd6162 100644
--- a/man/opal.resource_perm_add.Rd
+++ b/man/opal.resource_perm_add.Rd
@@ -41,17 +41,17 @@ opal.logout(o)
 }
 \seealso{
 Other resource functions: 
+\code{\link{opal.resource}()},
 \code{\link{opal.resource_create}()},
 \code{\link{opal.resource_delete}()},
 \code{\link{opal.resource_exists}()},
 \code{\link{opal.resource_extension_create}()},
 \code{\link{opal.resource_get}()},
-\code{\link{opal.resource_perm_delete}()},
 \code{\link{opal.resource_perm}()},
-\code{\link{opal.resources_perm_add}()},
-\code{\link{opal.resources_perm_delete}()},
-\code{\link{opal.resources_perm}()},
+\code{\link{opal.resource_perm_delete}()},
 \code{\link{opal.resources}()},
-\code{\link{opal.resource}()}
+\code{\link{opal.resources_perm}()},
+\code{\link{opal.resources_perm_add}()},
+\code{\link{opal.resources_perm_delete}()}
 }
 \concept{resource functions}
diff --git a/man/opal.resource_perm_delete.Rd b/man/opal.resource_perm_delete.Rd
index 2fc26d92..e88dbc61 100644
--- a/man/opal.resource_perm_delete.Rd
+++ b/man/opal.resource_perm_delete.Rd
@@ -31,17 +31,17 @@ opal.logout(o)
 }
 \seealso{
 Other resource functions: 
+\code{\link{opal.resource}()},
 \code{\link{opal.resource_create}()},
 \code{\link{opal.resource_delete}()},
 \code{\link{opal.resource_exists}()},
 \code{\link{opal.resource_extension_create}()},
 \code{\link{opal.resource_get}()},
-\code{\link{opal.resource_perm_add}()},
 \code{\link{opal.resource_perm}()},
-\code{\link{opal.resources_perm_add}()},
-\code{\link{opal.resources_perm_delete}()},
-\code{\link{opal.resources_perm}()},
+\code{\link{opal.resource_perm_add}()},
 \code{\link{opal.resources}()},
-\code{\link{opal.resource}()}
+\code{\link{opal.resources_perm}()},
+\code{\link{opal.resources_perm_add}()},
+\code{\link{opal.resources_perm_delete}()}
 }
 \concept{resource functions}
diff --git a/man/opal.resource_view_create.Rd b/man/opal.resource_view_create.Rd
index 6caaa428..9268bcba 100644
--- a/man/opal.resource_view_create.Rd
+++ b/man/opal.resource_view_create.Rd
@@ -58,9 +58,9 @@ Other table functions:
 \code{\link{opal.table_export}()},
 \code{\link{opal.table_get}()},
 \code{\link{opal.table_import}()},
+\code{\link{opal.table_perm}()},
 \code{\link{opal.table_perm_add}()},
 \code{\link{opal.table_perm_delete}()},
-\code{\link{opal.table_perm}()},
 \code{\link{opal.table_save}()},
 \code{\link{opal.table_truncate}()},
 \code{\link{opal.table_view_create}()},
diff --git a/man/opal.resource_view_reconnect.Rd b/man/opal.resource_view_reconnect.Rd
index aa36f723..34d80d5d 100644
--- a/man/opal.resource_view_reconnect.Rd
+++ b/man/opal.resource_view_reconnect.Rd
@@ -40,9 +40,9 @@ Other table functions:
 \code{\link{opal.table_export}()},
 \code{\link{opal.table_get}()},
 \code{\link{opal.table_import}()},
+\code{\link{opal.table_perm}()},
 \code{\link{opal.table_perm_add}()},
 \code{\link{opal.table_perm_delete}()},
-\code{\link{opal.table_perm}()},
 \code{\link{opal.table_save}()},
 \code{\link{opal.table_truncate}()},
 \code{\link{opal.table_view_create}()},
diff --git a/man/opal.resources.Rd b/man/opal.resources.Rd
index 3ef647b0..85d87645 100644
--- a/man/opal.resources.Rd
+++ b/man/opal.resources.Rd
@@ -25,17 +25,17 @@ opal.logout(o)
 }
 \seealso{
 Other resource functions: 
+\code{\link{opal.resource}()},
 \code{\link{opal.resource_create}()},
 \code{\link{opal.resource_delete}()},
 \code{\link{opal.resource_exists}()},
 \code{\link{opal.resource_extension_create}()},
 \code{\link{opal.resource_get}()},
+\code{\link{opal.resource_perm}()},
 \code{\link{opal.resource_perm_add}()},
 \code{\link{opal.resource_perm_delete}()},
-\code{\link{opal.resource_perm}()},
-\code{\link{opal.resources_perm_add}()},
-\code{\link{opal.resources_perm_delete}()},
 \code{\link{opal.resources_perm}()},
-\code{\link{opal.resource}()}
+\code{\link{opal.resources_perm_add}()},
+\code{\link{opal.resources_perm_delete}()}
 }
 \concept{resource functions}
diff --git a/man/opal.resources_perm.Rd b/man/opal.resources_perm.Rd
index f44b959f..ef546c15 100644
--- a/man/opal.resources_perm.Rd
+++ b/man/opal.resources_perm.Rd
@@ -28,17 +28,17 @@ opal.logout(o)
 }
 \seealso{
 Other resource functions: 
+\code{\link{opal.resource}()},
 \code{\link{opal.resource_create}()},
 \code{\link{opal.resource_delete}()},
 \code{\link{opal.resource_exists}()},
 \code{\link{opal.resource_extension_create}()},
 \code{\link{opal.resource_get}()},
+\code{\link{opal.resource_perm}()},
 \code{\link{opal.resource_perm_add}()},
 \code{\link{opal.resource_perm_delete}()},
-\code{\link{opal.resource_perm}()},
-\code{\link{opal.resources_perm_add}()},
-\code{\link{opal.resources_perm_delete}()},
 \code{\link{opal.resources}()},
-\code{\link{opal.resource}()}
+\code{\link{opal.resources_perm_add}()},
+\code{\link{opal.resources_perm_delete}()}
 }
 \concept{resource functions}
diff --git a/man/opal.resources_perm_add.Rd b/man/opal.resources_perm_add.Rd
index 526b2cfe..636329ec 100644
--- a/man/opal.resources_perm_add.Rd
+++ b/man/opal.resources_perm_add.Rd
@@ -32,17 +32,17 @@ opal.logout(o)
 }
 \seealso{
 Other resource functions: 
+\code{\link{opal.resource}()},
 \code{\link{opal.resource_create}()},
 \code{\link{opal.resource_delete}()},
 \code{\link{opal.resource_exists}()},
 \code{\link{opal.resource_extension_create}()},
 \code{\link{opal.resource_get}()},
+\code{\link{opal.resource_perm}()},
 \code{\link{opal.resource_perm_add}()},
 \code{\link{opal.resource_perm_delete}()},
-\code{\link{opal.resource_perm}()},
-\code{\link{opal.resources_perm_delete}()},
-\code{\link{opal.resources_perm}()},
 \code{\link{opal.resources}()},
-\code{\link{opal.resource}()}
+\code{\link{opal.resources_perm}()},
+\code{\link{opal.resources_perm_delete}()}
 }
 \concept{resource functions}
diff --git a/man/opal.resources_perm_delete.Rd b/man/opal.resources_perm_delete.Rd
index 79e592e8..a66d6dc8 100644
--- a/man/opal.resources_perm_delete.Rd
+++ b/man/opal.resources_perm_delete.Rd
@@ -29,17 +29,17 @@ opal.logout(o)
 }
 \seealso{
 Other resource functions: 
+\code{\link{opal.resource}()},
 \code{\link{opal.resource_create}()},
 \code{\link{opal.resource_delete}()},
 \code{\link{opal.resource_exists}()},
 \code{\link{opal.resource_extension_create}()},
 \code{\link{opal.resource_get}()},
+\code{\link{opal.resource_perm}()},
 \code{\link{opal.resource_perm_add}()},
 \code{\link{opal.resource_perm_delete}()},
-\code{\link{opal.resource_perm}()},
-\code{\link{opal.resources_perm_add}()},
-\code{\link{opal.resources_perm}()},
 \code{\link{opal.resources}()},
-\code{\link{opal.resource}()}
+\code{\link{opal.resources_perm}()},
+\code{\link{opal.resources_perm_add}()}
 }
 \concept{resource functions}
diff --git a/man/opal.table.Rd b/man/opal.table.Rd
index 16b1a2e5..189f5617 100644
--- a/man/opal.table.Rd
+++ b/man/opal.table.Rd
@@ -30,12 +30,12 @@ Other datasource functions:
 \code{\link{opal.annotate}()},
 \code{\link{opal.annotations}()},
 \code{\link{opal.attribute_values}()},
-\code{\link{opal.datasources}()},
 \code{\link{opal.datasource}()},
+\code{\link{opal.datasources}()},
 \code{\link{opal.tables}()},
 \code{\link{opal.valueset}()},
+\code{\link{opal.variable}()},
 \code{\link{opal.variable_summary}()},
-\code{\link{opal.variables}()},
-\code{\link{opal.variable}()}
+\code{\link{opal.variables}()}
 }
 \concept{datasource functions}
diff --git a/man/opal.table_create.Rd b/man/opal.table_create.Rd
index 4891ae15..74539b6c 100644
--- a/man/opal.table_create.Rd
+++ b/man/opal.table_create.Rd
@@ -46,9 +46,9 @@ Other table functions:
 \code{\link{opal.table_export}()},
 \code{\link{opal.table_get}()},
 \code{\link{opal.table_import}()},
+\code{\link{opal.table_perm}()},
 \code{\link{opal.table_perm_add}()},
 \code{\link{opal.table_perm_delete}()},
-\code{\link{opal.table_perm}()},
 \code{\link{opal.table_save}()},
 \code{\link{opal.table_truncate}()},
 \code{\link{opal.table_view_create}()},
diff --git a/man/opal.table_delete.Rd b/man/opal.table_delete.Rd
index cb2187a7..b804f385 100644
--- a/man/opal.table_delete.Rd
+++ b/man/opal.table_delete.Rd
@@ -38,9 +38,9 @@ Other table functions:
 \code{\link{opal.table_export}()},
 \code{\link{opal.table_get}()},
 \code{\link{opal.table_import}()},
+\code{\link{opal.table_perm}()},
 \code{\link{opal.table_perm_add}()},
 \code{\link{opal.table_perm_delete}()},
-\code{\link{opal.table_perm}()},
 \code{\link{opal.table_save}()},
 \code{\link{opal.table_truncate}()},
 \code{\link{opal.table_view_create}()},
diff --git a/man/opal.table_dictionary_get.Rd b/man/opal.table_dictionary_get.Rd
index f0a54b2a..f0061cdc 100644
--- a/man/opal.table_dictionary_get.Rd
+++ b/man/opal.table_dictionary_get.Rd
@@ -35,9 +35,9 @@ Other table functions:
 \code{\link{opal.table_export}()},
 \code{\link{opal.table_get}()},
 \code{\link{opal.table_import}()},
+\code{\link{opal.table_perm}()},
 \code{\link{opal.table_perm_add}()},
 \code{\link{opal.table_perm_delete}()},
-\code{\link{opal.table_perm}()},
 \code{\link{opal.table_save}()},
 \code{\link{opal.table_truncate}()},
 \code{\link{opal.table_view_create}()},
diff --git a/man/opal.table_dictionary_update.Rd b/man/opal.table_dictionary_update.Rd
index a7492416..48fefcec 100644
--- a/man/opal.table_dictionary_update.Rd
+++ b/man/opal.table_dictionary_update.Rd
@@ -58,9 +58,9 @@ Other table functions:
 \code{\link{opal.table_export}()},
 \code{\link{opal.table_get}()},
 \code{\link{opal.table_import}()},
+\code{\link{opal.table_perm}()},
 \code{\link{opal.table_perm_add}()},
 \code{\link{opal.table_perm_delete}()},
-\code{\link{opal.table_perm}()},
 \code{\link{opal.table_save}()},
 \code{\link{opal.table_truncate}()},
 \code{\link{opal.table_view_create}()},
diff --git a/man/opal.table_exists.Rd b/man/opal.table_exists.Rd
index 71111cee..ca4a8301 100644
--- a/man/opal.table_exists.Rd
+++ b/man/opal.table_exists.Rd
@@ -44,9 +44,9 @@ Other table functions:
 \code{\link{opal.table_export}()},
 \code{\link{opal.table_get}()},
 \code{\link{opal.table_import}()},
+\code{\link{opal.table_perm}()},
 \code{\link{opal.table_perm_add}()},
 \code{\link{opal.table_perm_delete}()},
-\code{\link{opal.table_perm}()},
 \code{\link{opal.table_save}()},
 \code{\link{opal.table_truncate}()},
 \code{\link{opal.table_view_create}()},
diff --git a/man/opal.table_export.Rd b/man/opal.table_export.Rd
index 12eac73a..02522b80 100644
--- a/man/opal.table_export.Rd
+++ b/man/opal.table_export.Rd
@@ -57,9 +57,9 @@ Other table functions:
 \code{\link{opal.table_exists}()},
 \code{\link{opal.table_get}()},
 \code{\link{opal.table_import}()},
+\code{\link{opal.table_perm}()},
 \code{\link{opal.table_perm_add}()},
 \code{\link{opal.table_perm_delete}()},
-\code{\link{opal.table_perm}()},
 \code{\link{opal.table_save}()},
 \code{\link{opal.table_truncate}()},
 \code{\link{opal.table_view_create}()},
diff --git a/man/opal.table_get.Rd b/man/opal.table_get.Rd
index a50bc904..7f40e285 100644
--- a/man/opal.table_get.Rd
+++ b/man/opal.table_get.Rd
@@ -50,9 +50,9 @@ Other table functions:
 \code{\link{opal.table_exists}()},
 \code{\link{opal.table_export}()},
 \code{\link{opal.table_import}()},
+\code{\link{opal.table_perm}()},
 \code{\link{opal.table_perm_add}()},
 \code{\link{opal.table_perm_delete}()},
-\code{\link{opal.table_perm}()},
 \code{\link{opal.table_save}()},
 \code{\link{opal.table_truncate}()},
 \code{\link{opal.table_view_create}()},
diff --git a/man/opal.table_import.Rd b/man/opal.table_import.Rd
index 3e31f4de..15a08a14 100644
--- a/man/opal.table_import.Rd
+++ b/man/opal.table_import.Rd
@@ -61,9 +61,9 @@ Other table functions:
 \code{\link{opal.table_exists}()},
 \code{\link{opal.table_export}()},
 \code{\link{opal.table_get}()},
+\code{\link{opal.table_perm}()},
 \code{\link{opal.table_perm_add}()},
 \code{\link{opal.table_perm_delete}()},
-\code{\link{opal.table_perm}()},
 \code{\link{opal.table_save}()},
 \code{\link{opal.table_truncate}()},
 \code{\link{opal.table_view_create}()},
diff --git a/man/opal.table_perm_add.Rd b/man/opal.table_perm_add.Rd
index 878cd1cd..a44cfe4f 100644
--- a/man/opal.table_perm_add.Rd
+++ b/man/opal.table_perm_add.Rd
@@ -45,8 +45,8 @@ Other table functions:
 \code{\link{opal.table_export}()},
 \code{\link{opal.table_get}()},
 \code{\link{opal.table_import}()},
-\code{\link{opal.table_perm_delete}()},
 \code{\link{opal.table_perm}()},
+\code{\link{opal.table_perm_delete}()},
 \code{\link{opal.table_save}()},
 \code{\link{opal.table_truncate}()},
 \code{\link{opal.table_view_create}()},
diff --git a/man/opal.table_perm_delete.Rd b/man/opal.table_perm_delete.Rd
index cc36aea5..18fbb5b5 100644
--- a/man/opal.table_perm_delete.Rd
+++ b/man/opal.table_perm_delete.Rd
@@ -42,8 +42,8 @@ Other table functions:
 \code{\link{opal.table_export}()},
 \code{\link{opal.table_get}()},
 \code{\link{opal.table_import}()},
-\code{\link{opal.table_perm_add}()},
 \code{\link{opal.table_perm}()},
+\code{\link{opal.table_perm_add}()},
 \code{\link{opal.table_save}()},
 \code{\link{opal.table_truncate}()},
 \code{\link{opal.table_view_create}()},
diff --git a/man/opal.table_save.Rd b/man/opal.table_save.Rd
index 8813109a..ddd1bf04 100644
--- a/man/opal.table_save.Rd
+++ b/man/opal.table_save.Rd
@@ -75,9 +75,9 @@ Other table functions:
 \code{\link{opal.table_export}()},
 \code{\link{opal.table_get}()},
 \code{\link{opal.table_import}()},
+\code{\link{opal.table_perm}()},
 \code{\link{opal.table_perm_add}()},
 \code{\link{opal.table_perm_delete}()},
-\code{\link{opal.table_perm}()},
 \code{\link{opal.table_truncate}()},
 \code{\link{opal.table_view_create}()},
 \code{\link{opal.table_view_update}()}
diff --git a/man/opal.table_truncate.Rd b/man/opal.table_truncate.Rd
index 5aaeb4d0..409116df 100644
--- a/man/opal.table_truncate.Rd
+++ b/man/opal.table_truncate.Rd
@@ -37,9 +37,9 @@ Other table functions:
 \code{\link{opal.table_export}()},
 \code{\link{opal.table_get}()},
 \code{\link{opal.table_import}()},
+\code{\link{opal.table_perm}()},
 \code{\link{opal.table_perm_add}()},
 \code{\link{opal.table_perm_delete}()},
-\code{\link{opal.table_perm}()},
 \code{\link{opal.table_save}()},
 \code{\link{opal.table_view_create}()},
 \code{\link{opal.table_view_update}()}
diff --git a/man/opal.table_view_create.Rd b/man/opal.table_view_create.Rd
index 98be019b..8bffbf0d 100644
--- a/man/opal.table_view_create.Rd
+++ b/man/opal.table_view_create.Rd
@@ -45,9 +45,9 @@ Other table functions:
 \code{\link{opal.table_export}()},
 \code{\link{opal.table_get}()},
 \code{\link{opal.table_import}()},
+\code{\link{opal.table_perm}()},
 \code{\link{opal.table_perm_add}()},
 \code{\link{opal.table_perm_delete}()},
-\code{\link{opal.table_perm}()},
 \code{\link{opal.table_save}()},
 \code{\link{opal.table_truncate}()},
 \code{\link{opal.table_view_update}()}
diff --git a/man/opal.table_view_update.Rd b/man/opal.table_view_update.Rd
index dfb1f658..0c5fbb33 100644
--- a/man/opal.table_view_update.Rd
+++ b/man/opal.table_view_update.Rd
@@ -59,9 +59,9 @@ Other table functions:
 \code{\link{opal.table_export}()},
 \code{\link{opal.table_get}()},
 \code{\link{opal.table_import}()},
+\code{\link{opal.table_perm}()},
 \code{\link{opal.table_perm_add}()},
 \code{\link{opal.table_perm_delete}()},
-\code{\link{opal.table_perm}()},
 \code{\link{opal.table_save}()},
 \code{\link{opal.table_truncate}()},
 \code{\link{opal.table_view_create}()}
diff --git a/man/opal.tables.Rd b/man/opal.tables.Rd
index 802942a9..fdabce2c 100644
--- a/man/opal.tables.Rd
+++ b/man/opal.tables.Rd
@@ -30,12 +30,12 @@ Other datasource functions:
 \code{\link{opal.annotate}()},
 \code{\link{opal.annotations}()},
 \code{\link{opal.attribute_values}()},
-\code{\link{opal.datasources}()},
 \code{\link{opal.datasource}()},
+\code{\link{opal.datasources}()},
 \code{\link{opal.table}()},
 \code{\link{opal.valueset}()},
+\code{\link{opal.variable}()},
 \code{\link{opal.variable_summary}()},
-\code{\link{opal.variables}()},
-\code{\link{opal.variable}()}
+\code{\link{opal.variables}()}
 }
 \concept{datasource functions}
diff --git a/man/opal.task_cancel.Rd b/man/opal.task_cancel.Rd
index f3c9e3e1..8cc65ab9 100644
--- a/man/opal.task_cancel.Rd
+++ b/man/opal.task_cancel.Rd
@@ -23,8 +23,8 @@ opal.logout(o)
 }
 \seealso{
 Other task functions: 
+\code{\link{opal.task}()},
 \code{\link{opal.task_wait}()},
-\code{\link{opal.tasks}()},
-\code{\link{opal.task}()}
+\code{\link{opal.tasks}()}
 }
 \concept{task functions}
diff --git a/man/opal.task_wait.Rd b/man/opal.task_wait.Rd
index 9d4fe16a..61391e11 100644
--- a/man/opal.task_wait.Rd
+++ b/man/opal.task_wait.Rd
@@ -25,8 +25,8 @@ opal.logout(o)
 }
 \seealso{
 Other task functions: 
+\code{\link{opal.task}()},
 \code{\link{opal.task_cancel}()},
-\code{\link{opal.tasks}()},
-\code{\link{opal.task}()}
+\code{\link{opal.tasks}()}
 }
 \concept{task functions}
diff --git a/man/opal.tasks.Rd b/man/opal.tasks.Rd
index c106ace3..228357e2 100644
--- a/man/opal.tasks.Rd
+++ b/man/opal.tasks.Rd
@@ -23,8 +23,8 @@ opal.logout(o)
 }
 \seealso{
 Other task functions: 
+\code{\link{opal.task}()},
 \code{\link{opal.task_cancel}()},
-\code{\link{opal.task_wait}()},
-\code{\link{opal.task}()}
+\code{\link{opal.task_wait}()}
 }
 \concept{task functions}
diff --git a/man/opal.taxonomies.Rd b/man/opal.taxonomies.Rd
index edfdc51a..c93d179b 100644
--- a/man/opal.taxonomies.Rd
+++ b/man/opal.taxonomies.Rd
@@ -26,10 +26,10 @@ opal.logout(o)
 }
 \seealso{
 Other taxonomy functions: 
+\code{\link{opal.taxonomy}()},
 \code{\link{opal.taxonomy_delete}()},
 \code{\link{opal.taxonomy_download}()},
 \code{\link{opal.taxonomy_upload}()},
-\code{\link{opal.taxonomy}()},
 \code{\link{opal.terms}()},
 \code{\link{opal.vocabularies}()},
 \code{\link{opal.vocabulary}()}
diff --git a/man/opal.taxonomy_delete.Rd b/man/opal.taxonomy_delete.Rd
index 36837f34..85b8d7e0 100644
--- a/man/opal.taxonomy_delete.Rd
+++ b/man/opal.taxonomy_delete.Rd
@@ -24,9 +24,9 @@ opal.logout(o)
 \seealso{
 Other taxonomy functions: 
 \code{\link{opal.taxonomies}()},
+\code{\link{opal.taxonomy}()},
 \code{\link{opal.taxonomy_download}()},
 \code{\link{opal.taxonomy_upload}()},
-\code{\link{opal.taxonomy}()},
 \code{\link{opal.terms}()},
 \code{\link{opal.vocabularies}()},
 \code{\link{opal.vocabulary}()}
diff --git a/man/opal.taxonomy_download.Rd b/man/opal.taxonomy_download.Rd
index a728139d..9b1e126b 100644
--- a/man/opal.taxonomy_download.Rd
+++ b/man/opal.taxonomy_download.Rd
@@ -27,9 +27,9 @@ opal.logout(o)
 \seealso{
 Other taxonomy functions: 
 \code{\link{opal.taxonomies}()},
+\code{\link{opal.taxonomy}()},
 \code{\link{opal.taxonomy_delete}()},
 \code{\link{opal.taxonomy_upload}()},
-\code{\link{opal.taxonomy}()},
 \code{\link{opal.terms}()},
 \code{\link{opal.vocabularies}()},
 \code{\link{opal.vocabulary}()}
diff --git a/man/opal.taxonomy_upload.Rd b/man/opal.taxonomy_upload.Rd
index 9b4dae13..0f27eb27 100644
--- a/man/opal.taxonomy_upload.Rd
+++ b/man/opal.taxonomy_upload.Rd
@@ -25,9 +25,9 @@ opal.logout(o)
 \seealso{
 Other taxonomy functions: 
 \code{\link{opal.taxonomies}()},
+\code{\link{opal.taxonomy}()},
 \code{\link{opal.taxonomy_delete}()},
 \code{\link{opal.taxonomy_download}()},
-\code{\link{opal.taxonomy}()},
 \code{\link{opal.terms}()},
 \code{\link{opal.vocabularies}()},
 \code{\link{opal.vocabulary}()}
diff --git a/man/opal.terms.Rd b/man/opal.terms.Rd
index 1c045f9e..78348ea7 100644
--- a/man/opal.terms.Rd
+++ b/man/opal.terms.Rd
@@ -30,10 +30,10 @@ opal.logout(o)
 \seealso{
 Other taxonomy functions: 
 \code{\link{opal.taxonomies}()},
+\code{\link{opal.taxonomy}()},
 \code{\link{opal.taxonomy_delete}()},
 \code{\link{opal.taxonomy_download}()},
 \code{\link{opal.taxonomy_upload}()},
-\code{\link{opal.taxonomy}()},
 \code{\link{opal.vocabularies}()},
 \code{\link{opal.vocabulary}()}
 }
diff --git a/man/opal.token_datashield_create.Rd b/man/opal.token_datashield_create.Rd
index ee68f5f9..9e19f161 100644
--- a/man/opal.token_datashield_create.Rd
+++ b/man/opal.token_datashield_create.Rd
@@ -29,11 +29,11 @@ opal.logout(o)
 }
 \seealso{
 Other token functions: 
+\code{\link{opal.token}()},
 \code{\link{opal.token_delete}()},
 \code{\link{opal.token_r_create}()},
 \code{\link{opal.token_renew}()},
 \code{\link{opal.token_sql_create}()},
-\code{\link{opal.tokens}()},
-\code{\link{opal.token}()}
+\code{\link{opal.tokens}()}
 }
 \concept{token functions}
diff --git a/man/opal.token_delete.Rd b/man/opal.token_delete.Rd
index 48f6de19..4bb819fe 100644
--- a/man/opal.token_delete.Rd
+++ b/man/opal.token_delete.Rd
@@ -24,11 +24,11 @@ opal.logout(o)
 }
 \seealso{
 Other token functions: 
+\code{\link{opal.token}()},
 \code{\link{opal.token_datashield_create}()},
 \code{\link{opal.token_r_create}()},
 \code{\link{opal.token_renew}()},
 \code{\link{opal.token_sql_create}()},
-\code{\link{opal.tokens}()},
-\code{\link{opal.token}()}
+\code{\link{opal.tokens}()}
 }
 \concept{token functions}
diff --git a/man/opal.token_r_create.Rd b/man/opal.token_r_create.Rd
index 5a59bb3e..6ba0fe17 100644
--- a/man/opal.token_r_create.Rd
+++ b/man/opal.token_r_create.Rd
@@ -39,11 +39,11 @@ opal.logout(o)
 }
 \seealso{
 Other token functions: 
+\code{\link{opal.token}()},
 \code{\link{opal.token_datashield_create}()},
 \code{\link{opal.token_delete}()},
 \code{\link{opal.token_renew}()},
 \code{\link{opal.token_sql_create}()},
-\code{\link{opal.tokens}()},
-\code{\link{opal.token}()}
+\code{\link{opal.tokens}()}
 }
 \concept{token functions}
diff --git a/man/opal.token_renew.Rd b/man/opal.token_renew.Rd
index 16c633a4..8f554453 100644
--- a/man/opal.token_renew.Rd
+++ b/man/opal.token_renew.Rd
@@ -24,11 +24,11 @@ opal.logout(o)
 }
 \seealso{
 Other token functions: 
+\code{\link{opal.token}()},
 \code{\link{opal.token_datashield_create}()},
 \code{\link{opal.token_delete}()},
 \code{\link{opal.token_r_create}()},
 \code{\link{opal.token_sql_create}()},
-\code{\link{opal.tokens}()},
-\code{\link{opal.token}()}
+\code{\link{opal.tokens}()}
 }
 \concept{token functions}
diff --git a/man/opal.token_sql_create.Rd b/man/opal.token_sql_create.Rd
index 538b2443..3b76029c 100644
--- a/man/opal.token_sql_create.Rd
+++ b/man/opal.token_sql_create.Rd
@@ -29,11 +29,11 @@ opal.logout(o)
 }
 \seealso{
 Other token functions: 
+\code{\link{opal.token}()},
 \code{\link{opal.token_datashield_create}()},
 \code{\link{opal.token_delete}()},
 \code{\link{opal.token_r_create}()},
 \code{\link{opal.token_renew}()},
-\code{\link{opal.tokens}()},
-\code{\link{opal.token}()}
+\code{\link{opal.tokens}()}
 }
 \concept{token functions}
diff --git a/man/opal.tokens.Rd b/man/opal.tokens.Rd
index 32f7c52a..336f2b7e 100644
--- a/man/opal.tokens.Rd
+++ b/man/opal.tokens.Rd
@@ -24,11 +24,11 @@ opal.logout(o)
 }
 \seealso{
 Other token functions: 
+\code{\link{opal.token}()},
 \code{\link{opal.token_datashield_create}()},
 \code{\link{opal.token_delete}()},
 \code{\link{opal.token_r_create}()},
 \code{\link{opal.token_renew}()},
-\code{\link{opal.token_sql_create}()},
-\code{\link{opal.token}()}
+\code{\link{opal.token_sql_create}()}
 }
 \concept{token functions}
diff --git a/man/opal.unload_package.Rd b/man/opal.unload_package.Rd
index 359f9a0a..5c632bb7 100644
--- a/man/opal.unload_package.Rd
+++ b/man/opal.unload_package.Rd
@@ -23,8 +23,8 @@ opal.logout(o)
 }
 \seealso{
 Other execution functions: 
-\code{\link{opal.execute.source}()},
 \code{\link{opal.execute}()},
+\code{\link{opal.execute.source}()},
 \code{\link{opal.load_package}()}
 }
 \concept{execution functions}
diff --git a/man/opal.valueset.Rd b/man/opal.valueset.Rd
index 58f4eac1..45c8e03f 100644
--- a/man/opal.valueset.Rd
+++ b/man/opal.valueset.Rd
@@ -30,12 +30,12 @@ Other datasource functions:
 \code{\link{opal.annotate}()},
 \code{\link{opal.annotations}()},
 \code{\link{opal.attribute_values}()},
-\code{\link{opal.datasources}()},
 \code{\link{opal.datasource}()},
-\code{\link{opal.tables}()},
+\code{\link{opal.datasources}()},
 \code{\link{opal.table}()},
+\code{\link{opal.tables}()},
+\code{\link{opal.variable}()},
 \code{\link{opal.variable_summary}()},
-\code{\link{opal.variables}()},
-\code{\link{opal.variable}()}
+\code{\link{opal.variables}()}
 }
 \concept{datasource functions}
diff --git a/man/opal.variable.Rd b/man/opal.variable.Rd
index d4385388..1e8c1ba2 100644
--- a/man/opal.variable.Rd
+++ b/man/opal.variable.Rd
@@ -30,10 +30,10 @@ Other datasource functions:
 \code{\link{opal.annotate}()},
 \code{\link{opal.annotations}()},
 \code{\link{opal.attribute_values}()},
-\code{\link{opal.datasources}()},
 \code{\link{opal.datasource}()},
-\code{\link{opal.tables}()},
+\code{\link{opal.datasources}()},
 \code{\link{opal.table}()},
+\code{\link{opal.tables}()},
 \code{\link{opal.valueset}()},
 \code{\link{opal.variable_summary}()},
 \code{\link{opal.variables}()}
diff --git a/man/opal.variable_summary.Rd b/man/opal.variable_summary.Rd
index eb5bc9af..e27e61cf 100644
--- a/man/opal.variable_summary.Rd
+++ b/man/opal.variable_summary.Rd
@@ -43,12 +43,12 @@ Other datasource functions:
 \code{\link{opal.annotate}()},
 \code{\link{opal.annotations}()},
 \code{\link{opal.attribute_values}()},
-\code{\link{opal.datasources}()},
 \code{\link{opal.datasource}()},
-\code{\link{opal.tables}()},
+\code{\link{opal.datasources}()},
 \code{\link{opal.table}()},
+\code{\link{opal.tables}()},
 \code{\link{opal.valueset}()},
-\code{\link{opal.variables}()},
-\code{\link{opal.variable}()}
+\code{\link{opal.variable}()},
+\code{\link{opal.variables}()}
 }
 \concept{datasource functions}
diff --git a/man/opal.variables.Rd b/man/opal.variables.Rd
index 5c2b9e09..a6991aa8 100644
--- a/man/opal.variables.Rd
+++ b/man/opal.variables.Rd
@@ -32,12 +32,12 @@ Other datasource functions:
 \code{\link{opal.annotate}()},
 \code{\link{opal.annotations}()},
 \code{\link{opal.attribute_values}()},
-\code{\link{opal.datasources}()},
 \code{\link{opal.datasource}()},
-\code{\link{opal.tables}()},
+\code{\link{opal.datasources}()},
 \code{\link{opal.table}()},
+\code{\link{opal.tables}()},
 \code{\link{opal.valueset}()},
-\code{\link{opal.variable_summary}()},
-\code{\link{opal.variable}()}
+\code{\link{opal.variable}()},
+\code{\link{opal.variable_summary}()}
 }
 \concept{datasource functions}
diff --git a/man/opal.vocabularies.Rd b/man/opal.vocabularies.Rd
index 13acf7db..fb29cc6f 100644
--- a/man/opal.vocabularies.Rd
+++ b/man/opal.vocabularies.Rd
@@ -28,10 +28,10 @@ opal.logout(o)
 \seealso{
 Other taxonomy functions: 
 \code{\link{opal.taxonomies}()},
+\code{\link{opal.taxonomy}()},
 \code{\link{opal.taxonomy_delete}()},
 \code{\link{opal.taxonomy_download}()},
 \code{\link{opal.taxonomy_upload}()},
-\code{\link{opal.taxonomy}()},
 \code{\link{opal.terms}()},
 \code{\link{opal.vocabulary}()}
 }
diff --git a/man/opal.vocabulary.Rd b/man/opal.vocabulary.Rd
index a97d1226..dd777ac8 100644
--- a/man/opal.vocabulary.Rd
+++ b/man/opal.vocabulary.Rd
@@ -26,10 +26,10 @@ opal.logout(o)
 \seealso{
 Other taxonomy functions: 
 \code{\link{opal.taxonomies}()},
+\code{\link{opal.taxonomy}()},
 \code{\link{opal.taxonomy_delete}()},
 \code{\link{opal.taxonomy_download}()},
 \code{\link{opal.taxonomy_upload}()},
-\code{\link{opal.taxonomy}()},
 \code{\link{opal.terms}()},
 \code{\link{opal.vocabularies}()}
 }
diff --git a/tests/testthat/test-url.R b/tests/testthat/test-url.R
new file mode 100644
index 00000000..0cd3bafc
--- /dev/null
+++ b/tests/testthat/test-url.R
@@ -0,0 +1,6 @@
+test_that("URL are cleaned", {
+  expected <- "https://opal.example.org/ws/files/some/path/to/file"
+  expect_equal(opalr:::.cleanUrl("https://opal.example.org/ws/files/some///path/to//file"), expected)
+  expected <- "http://localhost:8080/ws/files/some/path/to/file"
+  expect_equal(opalr:::.cleanUrl("http://localhost:8080/ws/files/some///path/to//file"), expected)
+})
\ No newline at end of file