diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/pull_request_template.md
similarity index 100%
rename from .github/PULL_REQUEST_TEMPLATE.md
rename to .github/pull_request_template.md
diff --git a/underworld/__init__.py b/underworld/__init__.py
index 3068db79e..c8c7c76a3 100644
--- a/underworld/__init__.py
+++ b/underworld/__init__.py
@@ -159,6 +159,7 @@ def _set_init_sig_as_sig(mod):
 _set_init_sig_as_sig(underworld.utils)
 timing._add_timing_to_mod(underworld.utils)
 
+import underworld.scaling
 
 # to allow our legacy doctest formats
 try:
diff --git a/underworld/libUnderworld/config/utils/options.py b/underworld/libUnderworld/config/utils/options.py
index 94738993c..75ef684ca 100644
--- a/underworld/libUnderworld/config/utils/options.py
+++ b/underworld/libUnderworld/config/utils/options.py
@@ -233,7 +233,7 @@ def make_help_string(self):
         elif v.type == "enum":
             help += v._pref_sep + "<%s>" % "|".join(v.enum.values())
         elif v.type == "bool":
-            if v._pref_true_flag is "":
+            if v._pref_true_flag == "":
                 help = "[" + help + "]"
             else:
                 help += v._pref_sep + "<" + v._pref_true_flag + \
diff --git a/underworld/scaling/_scaling.py b/underworld/scaling/_scaling.py
index b16de866d..628b45a19 100644
--- a/underworld/scaling/_scaling.py
+++ b/underworld/scaling/_scaling.py
@@ -41,14 +41,17 @@ def non_dimensionalise(dimValue):
 
     Parameters
     ----------
-    dimValue : pint quantity
+    dimValue : pint.Quantity 
+        A pint quantity.
 
     Returns
     -------
-    float: The scaled value.
+    float 
+        The scaled value.
+
+    Example
+    -------
 
-    Example:
-    --------
     >>> import underworld as uw
     >>> u = uw.scaling.units
 
diff --git a/underworld/systems/_energy_solver.py b/underworld/systems/_energy_solver.py
index 5b3f991d7..cadc9f10c 100644
--- a/underworld/systems/_energy_solver.py
+++ b/underworld/systems/_energy_solver.py
@@ -138,7 +138,7 @@ def _check_linearity(self, nonLinearIterate):
 
     def configure(self,solve_type=""):
         """
-        Configure velocity/inner solver (A11 PETSc prefix).
+        Configure solver.
 
         solve_type can be one of: