diff --git a/LICENSE b/LICENSE
index ec7f118..792fb70 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019 Oak Ridge National Laboratory, UT-Battelle, LLC.
+Copyright (c) 2019--2020 Oak Ridge National Laboratory, UT--Battelle, LLC.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/doc/conf.py b/doc/conf.py
index 3343273..2ebd92d 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -20,7 +20,7 @@
 # -- Project information -----------------------------------------------------
 
 project = 'Flibcpp'
-copyright = '2019, Oak Ridge National Laboratory, UT-Battelle, LLC'
+copyright = '2020, Oak Ridge National Laboratory, UT-Battelle, LLC'
 author = 'Seth R Johnson'
 
 # The short X.Y version
@@ -104,7 +104,7 @@
 # -- Options for HTMLHelp output ---------------------------------------------
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'Flibcppdoc'
+htmlhelp_basename = 'Flibcpp'
 
 
 # -- Options for LaTeX output ------------------------------------------------
diff --git a/doc/index.rst b/doc/index.rst
index 4a4ddea..9e751dd 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -2,10 +2,6 @@
 .. File  : doc/index.rst
 .. ############################################################################
 
-.. raw:: latex
-
-   \frontmatter
-
 =======
 Flibcpp
 =======
@@ -16,7 +12,6 @@ Flibcpp
 
 .. raw:: latex
 
-   \mainmatter
    \begin{abstract}
 
 Flibcpp uses SWIG-Fortran to generate native Fortran-2003 interfaces to
diff --git a/include/flc.i b/include/flc.i
index 7c051ae..8b265c9 100644
--- a/include/flc.i
+++ b/include/flc.i
@@ -1,7 +1,7 @@
 /*!
  * \file flc.i
  *
- * Copyright (c) 2019 Oak Ridge National Laboratory, UT-Battelle, LLC.
+ * Copyright (c) 2019-2020 Oak Ridge National Laboratory, UT-Battelle, LLC.
  * Distributed under an MIT open source license: see LICENSE for details.
  */
 
@@ -18,13 +18,13 @@
 %define %flc_add_header
 %insert("fbegin") %{
 ! Flibcpp project, https://github.com/swig-fortran/flibcpp
-! Copyright (c) 2019 Oak Ridge National Laboratory, UT-Battelle, LLC.
+! Copyright (c) 2019-2020 Oak Ridge National Laboratory, UT-Battelle, LLC.
 ! Distributed under an MIT open source license: see LICENSE for details.
 %}
 %insert("begin") %{
 /*
  * Flibcpp project, https://github.com/swig-fortran/flibcpp
- * Copyright (c) 2019 Oak Ridge National Laboratory, UT-Battelle, LLC.
+ * Copyright (c) 2019-2020 Oak Ridge National Laboratory, UT-Battelle, LLC.
  * Distributed under an MIT open source license: see LICENSE for details.
  */
 %}
diff --git a/include/flc_vector.i b/include/flc_vector.i
index 19c8a02..f923534 100644
--- a/include/flc_vector.i
+++ b/include/flc_vector.i
@@ -89,7 +89,7 @@ namespace std {
 
     %swig_std_vector(std::complex<T>, const std::complex<T>&)
     %swig_std_vector_extend_ref(std::complex<T>)
-    %flc_std_vector_extend_pod(std::complex<T>, SwigComplex_ ## T)
+    %flc_std_vector_extend_pod(std::complex<T>, SwigComplex_##T)
   };
 }
 
diff --git a/src/flc.f90 b/src/flc.f90
index 1e9b274..445bbac 100644
--- a/src/flc.f90
+++ b/src/flc.f90
@@ -5,7 +5,7 @@
 ! the SWIG interface file instead.
 
 ! Flibcpp project, https://github.com/swig-fortran/flibcpp
-! Copyright (c) 2019 Oak Ridge National Laboratory, UT-Battelle, LLC.
+! Copyright (c) 2019-2020 Oak Ridge National Laboratory, UT-Battelle, LLC.
 ! Distributed under an MIT open source license: see LICENSE for details.
 
 module flc
diff --git a/src/flcFORTRAN_wrap.cxx b/src/flcFORTRAN_wrap.cxx
index f01456e..464c3c0 100644
--- a/src/flcFORTRAN_wrap.cxx
+++ b/src/flcFORTRAN_wrap.cxx
@@ -10,7 +10,7 @@
 
 /*
  * Flibcpp project, https://github.com/swig-fortran/flibcpp
- * Copyright (c) 2019 Oak Ridge National Laboratory, UT-Battelle, LLC.
+ * Copyright (c) 2019-2020 Oak Ridge National Laboratory, UT-Battelle, LLC.
  * Distributed under an MIT open source license: see LICENSE for details.
  */
 
diff --git a/src/flc_algorithm.f90 b/src/flc_algorithm.f90
index 40d8ac7..99f4040 100644
--- a/src/flc_algorithm.f90
+++ b/src/flc_algorithm.f90
@@ -5,7 +5,7 @@
 ! the SWIG interface file instead.
 
 ! Flibcpp project, https://github.com/swig-fortran/flibcpp
-! Copyright (c) 2019 Oak Ridge National Laboratory, UT-Battelle, LLC.
+! Copyright (c) 2019-2020 Oak Ridge National Laboratory, UT-Battelle, LLC.
 ! Distributed under an MIT open source license: see LICENSE for details.
 
 module flc_algorithm
diff --git a/src/flc_algorithmFORTRAN_wrap.cxx b/src/flc_algorithmFORTRAN_wrap.cxx
index e24c116..a29677b 100644
--- a/src/flc_algorithmFORTRAN_wrap.cxx
+++ b/src/flc_algorithmFORTRAN_wrap.cxx
@@ -10,7 +10,7 @@
 
 /*
  * Flibcpp project, https://github.com/swig-fortran/flibcpp
- * Copyright (c) 2019 Oak Ridge National Laboratory, UT-Battelle, LLC.
+ * Copyright (c) 2019-2020 Oak Ridge National Laboratory, UT-Battelle, LLC.
  * Distributed under an MIT open source license: see LICENSE for details.
  */
 
diff --git a/src/flc_map.f90 b/src/flc_map.f90
index 9dcc1ac..0a06a0c 100644
--- a/src/flc_map.f90
+++ b/src/flc_map.f90
@@ -5,7 +5,7 @@
 ! the SWIG interface file instead.
 
 ! Flibcpp project, https://github.com/swig-fortran/flibcpp
-! Copyright (c) 2019 Oak Ridge National Laboratory, UT-Battelle, LLC.
+! Copyright (c) 2019-2020 Oak Ridge National Laboratory, UT-Battelle, LLC.
 ! Distributed under an MIT open source license: see LICENSE for details.
 
 module flc_map
diff --git a/src/flc_mapFORTRAN_wrap.cxx b/src/flc_mapFORTRAN_wrap.cxx
index 931cbba..f2b9498 100644
--- a/src/flc_mapFORTRAN_wrap.cxx
+++ b/src/flc_mapFORTRAN_wrap.cxx
@@ -10,7 +10,7 @@
 
 /*
  * Flibcpp project, https://github.com/swig-fortran/flibcpp
- * Copyright (c) 2019 Oak Ridge National Laboratory, UT-Battelle, LLC.
+ * Copyright (c) 2019-2020 Oak Ridge National Laboratory, UT-Battelle, LLC.
  * Distributed under an MIT open source license: see LICENSE for details.
  */
 
diff --git a/src/flc_random.f90 b/src/flc_random.f90
index 0717a54..0829e85 100644
--- a/src/flc_random.f90
+++ b/src/flc_random.f90
@@ -5,7 +5,7 @@
 ! the SWIG interface file instead.
 
 ! Flibcpp project, https://github.com/swig-fortran/flibcpp
-! Copyright (c) 2019 Oak Ridge National Laboratory, UT-Battelle, LLC.
+! Copyright (c) 2019-2020 Oak Ridge National Laboratory, UT-Battelle, LLC.
 ! Distributed under an MIT open source license: see LICENSE for details.
 
 module flc_random
diff --git a/src/flc_randomFORTRAN_wrap.cxx b/src/flc_randomFORTRAN_wrap.cxx
index a0bd48c..7962edb 100644
--- a/src/flc_randomFORTRAN_wrap.cxx
+++ b/src/flc_randomFORTRAN_wrap.cxx
@@ -10,7 +10,7 @@
 
 /*
  * Flibcpp project, https://github.com/swig-fortran/flibcpp
- * Copyright (c) 2019 Oak Ridge National Laboratory, UT-Battelle, LLC.
+ * Copyright (c) 2019-2020 Oak Ridge National Laboratory, UT-Battelle, LLC.
  * Distributed under an MIT open source license: see LICENSE for details.
  */
 
diff --git a/src/flc_set.f90 b/src/flc_set.f90
index c71fbd1..b448d2d 100644
--- a/src/flc_set.f90
+++ b/src/flc_set.f90
@@ -5,7 +5,7 @@
 ! the SWIG interface file instead.
 
 ! Flibcpp project, https://github.com/swig-fortran/flibcpp
-! Copyright (c) 2019 Oak Ridge National Laboratory, UT-Battelle, LLC.
+! Copyright (c) 2019-2020 Oak Ridge National Laboratory, UT-Battelle, LLC.
 ! Distributed under an MIT open source license: see LICENSE for details.
 
 module flc_set
diff --git a/src/flc_setFORTRAN_wrap.cxx b/src/flc_setFORTRAN_wrap.cxx
index 6a5e3f5..818e258 100644
--- a/src/flc_setFORTRAN_wrap.cxx
+++ b/src/flc_setFORTRAN_wrap.cxx
@@ -10,7 +10,7 @@
 
 /*
  * Flibcpp project, https://github.com/swig-fortran/flibcpp
- * Copyright (c) 2019 Oak Ridge National Laboratory, UT-Battelle, LLC.
+ * Copyright (c) 2019-2020 Oak Ridge National Laboratory, UT-Battelle, LLC.
  * Distributed under an MIT open source license: see LICENSE for details.
  */
 
diff --git a/src/flc_string.f90 b/src/flc_string.f90
index b9afc8a..323558e 100644
--- a/src/flc_string.f90
+++ b/src/flc_string.f90
@@ -5,7 +5,7 @@
 ! the SWIG interface file instead.
 
 ! Flibcpp project, https://github.com/swig-fortran/flibcpp
-! Copyright (c) 2019 Oak Ridge National Laboratory, UT-Battelle, LLC.
+! Copyright (c) 2019-2020 Oak Ridge National Laboratory, UT-Battelle, LLC.
 ! Distributed under an MIT open source license: see LICENSE for details.
 
 module flc_string
diff --git a/src/flc_stringFORTRAN_wrap.cxx b/src/flc_stringFORTRAN_wrap.cxx
index 86aae62..14e08b7 100644
--- a/src/flc_stringFORTRAN_wrap.cxx
+++ b/src/flc_stringFORTRAN_wrap.cxx
@@ -10,7 +10,7 @@
 
 /*
  * Flibcpp project, https://github.com/swig-fortran/flibcpp
- * Copyright (c) 2019 Oak Ridge National Laboratory, UT-Battelle, LLC.
+ * Copyright (c) 2019-2020 Oak Ridge National Laboratory, UT-Battelle, LLC.
  * Distributed under an MIT open source license: see LICENSE for details.
  */
 
diff --git a/src/flc_vector.f90 b/src/flc_vector.f90
index 1e4a668..90e062c 100644
--- a/src/flc_vector.f90
+++ b/src/flc_vector.f90
@@ -5,7 +5,7 @@
 ! the SWIG interface file instead.
 
 ! Flibcpp project, https://github.com/swig-fortran/flibcpp
-! Copyright (c) 2019 Oak Ridge National Laboratory, UT-Battelle, LLC.
+! Copyright (c) 2019-2020 Oak Ridge National Laboratory, UT-Battelle, LLC.
 ! Distributed under an MIT open source license: see LICENSE for details.
 
 module flc_vector
diff --git a/src/flc_vectorFORTRAN_wrap.cxx b/src/flc_vectorFORTRAN_wrap.cxx
index 47c4265..baacb0e 100644
--- a/src/flc_vectorFORTRAN_wrap.cxx
+++ b/src/flc_vectorFORTRAN_wrap.cxx
@@ -10,7 +10,7 @@
 
 /*
  * Flibcpp project, https://github.com/swig-fortran/flibcpp
- * Copyright (c) 2019 Oak Ridge National Laboratory, UT-Battelle, LLC.
+ * Copyright (c) 2019-2020 Oak Ridge National Laboratory, UT-Battelle, LLC.
  * Distributed under an MIT open source license: see LICENSE for details.
  */