diff --git a/docs/source/contributing.rst b/docs/source/contributing.rst
index b8f8165..f78c37a 100644
--- a/docs/source/contributing.rst
+++ b/docs/source/contributing.rst
@@ -38,10 +38,11 @@
      `Cygwin <http://www.cygwin.com/>`_ install.
 
 2. Sign up for `Gerrit
-   <https://ceres-solver-review.googlesource.com/>`_. You will also
-   need to sign the Contributor License Agreement (CLA) with Google,
-   which gives Google a royalty-free unlimited license to use your
-   contributions. You retain copyright.
+   <https://ceres-solver-review.googlesource.com/>`_. You will also need to
+   `sign the Contributor License Agreement (CLA)
+   <https://opensource.google.com/docs/cla/#sign>`_ with Google, which gives
+   Google a royalty-free unlimited license to use your contributions. You
+   retain copyright.
 
 3. Clone the Ceres Solver ``git`` repository from Gerrit.
 
diff --git a/docs/source/installation.rst b/docs/source/installation.rst
index 6c42ef0..bd3c821 100644
--- a/docs/source/installation.rst
+++ b/docs/source/installation.rst
@@ -89,9 +89,9 @@
   ``SuiteSparse``, and optionally used by Ceres directly for some
   operations.
 
--  `TBB <https://www.threadingbuildingblocks.org/>`_ is a C++11 template
-  library for parallel programming that optionally can be used as an alternative
-  to OpenMP. **Optional**
+- `TBB <https://www.threadingbuildingblocks.org/>`_ is a C++11 template
+  library for parallel programming that optionally can be used as an
+  alternative to OpenMP. **Optional**
 
   On ``UNIX`` OSes other than Mac OS X we recommend `ATLAS
   <http://math-atlas.sourceforge.net/>`_, which includes ``BLAS`` and
diff --git a/docs/source/nnls_modeling.rst b/docs/source/nnls_modeling.rst
index abc1ccc..36ee550 100644
--- a/docs/source/nnls_modeling.rst
+++ b/docs/source/nnls_modeling.rst
@@ -22,7 +22,7 @@
 Ceres solves robustified bounds constrained non-linear least squares
 problems of the form:
 
-.. math:: :label: ceresproblem
+.. math:: :label: ceresproblem_modeling
 
    \min_{\mathbf{x}} &\quad \frac{1}{2}\sum_{i}
    \rho_i\left(\left\|f_i\left(x_{i_1},
@@ -1455,9 +1455,10 @@
 .. class:: Problem
 
    :class:`Problem` holds the robustified bounds constrained
-   non-linear least squares problem :eq:`ceresproblem`. To create a
-   least squares problem, use the :func:`Problem::AddResidualBlock`
-   and :func:`Problem::AddParameterBlock` methods.
+   non-linear least squares problem :eq:`ceresproblem_modeling`. To
+   create a least squares problem, use the
+   :func:`Problem::AddResidualBlock` and
+   :func:`Problem::AddParameterBlock` methods.
 
    For example a problem containing 3 parameter blocks of sizes 3, 4
    and 5 respectively and two residual blocks of size 2 and 6:
diff --git a/docs/source/nnls_tutorial.rst b/docs/source/nnls_tutorial.rst
index 9c4e585..5e78a05 100644
--- a/docs/source/nnls_tutorial.rst
+++ b/docs/source/nnls_tutorial.rst
@@ -54,7 +54,7 @@
 <http://en.wikipedia.org/wiki/Non-linear_least_squares>`_.
 
 .. math:: \frac{1}{2}\sum_{i} \left\|f_i\left(x_{i_1}, ... ,x_{i_k}\right)\right\|^2.
-   :label: ceresproblem2
+   :label: ceresproblemnonrobust
 
 .. _section-hello-world:
 
diff --git a/include/ceres/cost_function.h b/include/ceres/cost_function.h
index f051a89..94725d3 100644
--- a/include/ceres/cost_function.h
+++ b/include/ceres/cost_function.h
@@ -1,5 +1,5 @@
 // Ceres Solver - A fast non-linear least squares minimizer
-// Copyright 2015 Google Inc. All rights reserved.
+// Copyright 2017 Google Inc. All rights reserved.
 // http://ceres-solver.org/
 //
 // Redistribution and use in source and binary forms, with or without
@@ -55,7 +55,7 @@
 // This class implements the computation of the cost (a.k.a. residual) terms as
 // a function of the input (control) variables, and is the interface for users
 // to describe their least squares problem to Ceres. In other words, this is the
-// modelling layer between users and the Ceres optimizer. The signature of the
+// modeling layer between users and the Ceres optimizer. The signature of the
 // function (number and sizes of input parameter blocks and number of outputs)
 // is stored in parameter_block_sizes_ and num_residuals_ respectively. User
 // code inheriting from this class is expected to set these two members with the