diff --git a/openmc/mesh.py b/openmc/mesh.py
index c2b23bf1f9..58b9c7c0e5 100644
--- a/openmc/mesh.py
+++ b/openmc/mesh.py
@@ -6,8 +6,7 @@ import sys
 import numpy as np
 
 import openmc.checkvalue as cv
-import openmc.surface
-import openmc.cell
+import openmc
 
 
 if sys.version_info[0] >= 3:
@@ -199,6 +198,7 @@ class Mesh(object):
         ...
 
         """
+
         if len(self.dimension) == 2:
             for x in range(self.dimension[0]):
                 for y in range(self.dimension[1]):
@@ -241,7 +241,7 @@ class Mesh(object):
 
     def build_cells(self, bc=['reflective'] * 6):
         """Generates a lattice of universes with the same dimensionality
-        as the mesh object in self.  The individual cells/universes produced
+        as the mesh object.  The individual cells/universes produced
         will not have material definitions applied and so downstream code
         will have to apply that information.
 
diff --git a/openmc/mgxs/library.py b/openmc/mgxs/library.py
index d3d32ee599..9e5dba310c 100644
--- a/openmc/mgxs/library.py
+++ b/openmc/mgxs/library.py
@@ -899,7 +899,7 @@ class Library(object):
             cv.check_greater_than('tabular_points', tabular_points, 1)
         if subdomain is not None:
             cv.check_iterable_type('subdomain', subdomain, Integral,
-                                   max_depth=2)
+                                   max_depth=3)
 
         # Make sure statepoint has been loaded
         if self._sp_filename is None:
@@ -1123,8 +1123,6 @@ class Library(object):
 
                     # Create XSdata and Macroscopic for this domain
                     xsdata = self.get_xsdata(domain, xsdata_name,
-                                             nuclide='total',
-                                             xs_type=xs_type,
                                              xs_id=all_xs_ids[i],
                                              tabular_legendre=tabular_legendre,
                                              tabular_points=tabular_points,
@@ -1192,7 +1190,7 @@ class Library(object):
             in building the tabular distribution. Default is `33`.
         bc : iterable of {'reflective', 'periodic', 'transmission', or 'vacuum'}
             Boundary conditions for each of the four faces of a rectangle
-            (if aplying to a 2D mesh) or six faces of a parallelepiped
+            (if applying to a 2D mesh) or six faces of a parallelepiped
             (if applying to a 3D mesh) provided in the following order:
             [x min, x max, y min, y max, z min, z max].  2-D cells do not
             contain the z min and z max entries.
@@ -1227,7 +1225,7 @@ class Library(object):
         self.check_library_for_openmc_mgxs()
 
         # If the domain type is a mesh, then there can only be one domain for
-        # this method. Thi is because we can build a model automatically if
+        # this method. This is because we can build a model automatically if
         # the user provided multiple mesh domains for library generation since
         # the multiple meshes could be overlapping or in disparate regions
         # of the continuous energy model. The next step makes sure there is
diff --git a/openmc/mgxs_library.py b/openmc/mgxs_library.py
index c9a7debdcd..a3a2187b75 100644
--- a/openmc/mgxs_library.py
+++ b/openmc/mgxs_library.py
@@ -622,7 +622,7 @@ class XSdata(object):
             barns. Defaults to 'macro'.
         subdomain : iterable of int
             If the MGXS contains a mesh domain type, the subdomain parameter
-            specifies which mesh cell ([i, j, k]) to use.
+            specifies which mesh cell (i.e., [i, j, k] index) to use.
 
         See also
         --------
@@ -662,7 +662,7 @@ class XSdata(object):
             barns. Defaults to 'macro'.
         subdomain : iterable of int
             If the MGXS contains a mesh domain type, the subdomain parameter
-            specifies which mesh cell ([i, j, k]) to use.
+            specifies which mesh cell (i.e., [i, j, k] index) to use.
 
         See also
         --------
@@ -703,7 +703,7 @@ class XSdata(object):
             barns. Defaults to 'macro'.
         subdomain : iterable of int
             If the MGXS contains a mesh domain type, the subdomain parameter
-            specifies which mesh cell ([i, j, k]) to use.
+            specifies which mesh cell (i.e., [i, j, k] index) to use.
 
         See also
         --------
@@ -744,7 +744,7 @@ class XSdata(object):
             barns. Defaults to 'macro'.
         subdomain : iterable of int
             If the MGXS contains a mesh domain type, the subdomain parameter
-            specifies which mesh cell ([i, j, k]) to use.
+            specifies which mesh cell (i.e., [i, j, k] index) to use.
 
         See also
         --------
@@ -795,7 +795,7 @@ class XSdata(object):
             barns. Defaults to 'macro'.
         subdomain : iterable of int
             If the MGXS contains a mesh domain type, the subdomain parameter
-            specifies which mesh cell ([i, j, k]) to use.
+            specifies which mesh cell (i.e., [i, j, k] index) to use.
 
         See also
         --------
@@ -835,7 +835,7 @@ class XSdata(object):
             barns. Defaults to 'macro'.
         subdomain : iterable of int
             If the MGXS contains a mesh domain type, the subdomain parameter
-            specifies which mesh cell ([i, j, k]) to use.
+            specifies which mesh cell (i.e., [i, j, k] index) to use.
 
         See also
         --------
@@ -885,7 +885,7 @@ class XSdata(object):
             barns. Defaults to 'macro'.
         subdomain : iterable of int
             If the MGXS contains a mesh domain type, the subdomain parameter
-            specifies which mesh cell ([i, j, k]) to use.
+            specifies which mesh cell (i.e., [i, j, k] index) to use.
 
         See also
         --------
@@ -958,7 +958,7 @@ class XSdata(object):
             barns. Defaults to 'macro'.
         subdomain : iterable of int
             If the MGXS contains a mesh domain type, the subdomain parameter
-            specifies which mesh cell ([i, j, k]) to use.
+            specifies which mesh cell (i.e., [i, j, k] index) to use.
 
         See also
         --------