diff --git a/doc/src/pg_developer.rst b/doc/src/pg_developer.rst
index 8d15aa0e6f..05b254ee52 100644
--- a/doc/src/pg_developer.rst
+++ b/doc/src/pg_developer.rst
@@ -827,7 +827,7 @@ and parsing files or arguments.
 .. doxygenfunction:: count_words(const std::string &text, const std::string &separators)
    :project: progguide
 
-.. doxygenfunction:: trim_and_count_words
+.. doxygenfunction:: trim_and_count_words(const std::string &text, const std::string &separators)
    :project: progguide
 
 .. doxygenfunction:: split_words
@@ -1091,7 +1091,7 @@ Eigensolver classes
 
 The "math_eigen.h" file contains the definition of 3 template classes
 used for calculating eigenvalues and eigenvectors of matrices:
-"Jacobi", "PeigenDense", and "LambdaLanczos".
+"Jacobi", "PEigenDense", and "LambdaLanczos".
 
 "Jacobi" calculates all of the eigenvalues and eigenvectors
 of a dense, symmetric, real matrix.
diff --git a/doc/utils/sphinx-config/false_positives.txt b/doc/utils/sphinx-config/false_positives.txt
index ff10797b8d..5dd4ea3b1b 100644
--- a/doc/utils/sphinx-config/false_positives.txt
+++ b/doc/utils/sphinx-config/false_positives.txt
@@ -398,6 +398,7 @@ ChiralIDs
 chiralIDs
 chirality
 Cho
+ChooseOffset
 chris
 Christoph
 Chu
@@ -470,6 +471,7 @@ config
 configfile
 configurational
 conformational
+ConstMatrix
 Contrib
 cooperativity
 coord
@@ -782,10 +784,11 @@ Eggebrecht
 ehex
 eHEX
 Ei
-Eigen
 eigen
-Eigendecomposition
-Eigensolve
+eigensolve
+eigensolver
+eigensolvers
+eigendecomposition
 eigenvalue
 eigenvalues
 eigenvector
@@ -1550,6 +1553,7 @@ Ladd
 lagrangian
 lambdai
 lamda
+LambdaLanczos
 lammps
 Lammps
 LAMMPS
@@ -2346,6 +2350,7 @@ peachpuff
 Pearlman
 Pedersen
 peID
+PEigenDense
 Peng
 peptide
 peratom
@@ -2574,6 +2579,8 @@ rdf
 RDideal
 rdx
 reacter
+realTypeMap
+real_t
 README
 realtime
 reamin
@@ -3146,6 +3153,8 @@ tu
 Tuckerman
 tue
 tunable
+tuple
+tuples
 Turkand
 Tutein
 tweakable
diff --git a/src/math_eigen.cpp b/src/math_eigen.cpp
index 18ca97200b..9255338e09 100644
--- a/src/math_eigen.cpp
+++ b/src/math_eigen.cpp
@@ -137,4 +137,3 @@ jacobi3(double const* const* mat, // the 3x3 matrix you wish to diagonalize
 
   return ierror;
 }
-
diff --git a/src/math_eigen.h b/src/math_eigen.h
index 9492ec001a..a0bd292263 100644
--- a/src/math_eigen.h
+++ b/src/math_eigen.h
@@ -892,7 +892,7 @@ swap(Jacobi<Scalar, Vector, Matrix, ConstMatrix> &other) {
 template<typename Scalar,typename Vector,typename Matrix,typename ConstMatrix>
 Jacobi<Scalar, Vector, Matrix, ConstMatrix>::
 Jacobi(Jacobi<Scalar, Vector, Matrix, ConstMatrix>&& other) {
-  Init(); 
+  Init();
   this->swap(other);
 }
 
diff --git a/src/utils.h b/src/utils.h
index a06be39e28..7ab3e7876e 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -236,7 +236,14 @@ namespace LAMMPS_NS {
      * \param separators string containing characters that will be treated as whitespace
      * \return number of words found
      */
-    size_t trim_and_count_words(const std::string &text, const std::string &separators = " \t\r\n\f");
+    size_t trim_and_count_words(const std::string &text, const std::string &separators);
+
+    /** This version sets the separators argument to " \t\r\n\f" by default
+     */
+    size_t trim_and_count_words(const std::string &text) {
+      std::string separators = " \t\r\n\f";
+      return trim_and_count_words(text, separators);
+    }
 
     /** Take text and split into non-whitespace words.
      *