diff --git a/Lib/MV2.py b/Lib/MV2.py
index ee69b74d..f5991ee9 100644
--- a/Lib/MV2.py
+++ b/Lib/MV2.py
@@ -76,8 +76,13 @@ def _extractMetadata(a, axes=None, attributes=None,
 
 class var_unary_operation:
     def __init__(self, mafunc):
-        """ var_unary_operation(mafunc)
-        mafunc is an numpy.ma masked_unary_function.
+        """
+        Parameters
+        ----------
+
+            var_unary_operation(mafunc)
+
+            mafunc is an numpy.ma masked_unary_function.
         """
         self.mafunc = mafunc
         self.__doc__ = mafunc.__doc__
@@ -91,8 +96,13 @@ def __call__(self, a, **kwargs):
 
 class var_unary_operation_with_axis:
     def __init__(self, mafunc):
-        """ var_unary_operation(mafunc)
-        mafunc is an numpy.ma masked_unary_function.
+        """
+        Parameters
+        ----------
+
+            var_unary_operation(mafunc)
+
+            mafunc is an numpy.ma masked_unary_function.
         """
         self.mafunc = mafunc
         self.__doc__ = mafunc.__doc__
@@ -108,14 +118,24 @@ def __call__(self, a, axis=0, **kwargs):
 
 
 def commonDomain(a, b, omit=None):
-    """commonDomain(a,b) tests that the domains of variables/arrays a and b are equal,
-    and returns the common domain if equal, or None if not equal.
+    """
+    Parameters
+    ----------
+
+        commonDomain(a,b)
+            tests that the domains of variables/arrays a and b are equal,
+            and
 
-       The domains may differ in that one domain may have leading axes not common
-       to the other; the result domain will contain those axes.
+    Returns
+    -------
 
-       If <omit> is specified, as an integer i, skip comparison of the ith dimension
-       and return None for the ith (common) dimension.
+        the common domain if equal, or None if not equal.
+
+        The domains may differ in that one domain may have leading
+        axes not common to the other; the result domain will contain those axes.
+
+         If <omit> is specified, as an integer i, skip comparison of the ith dimension
+        and return None for the ith (common) dimension.
     """
 
     if isinstance(b, AbstractVariable):
@@ -126,8 +146,14 @@ def commonDomain(a, b, omit=None):
 
 
 def commonAxes(a, bdom, omit=None):
-    """Helper function for commonDomain. 'a' is a variable or array,
-    'b' is an axislist or None.
+    """Helper function for commonDomain.
+
+    Parameters
+    ----------
+
+        'a' is a variable or array,
+
+        'b' is an axislist or None.
     """
     if isinstance(a, AbstractVariable) and bdom is not None:
         adom = a.getAxisList()
@@ -181,9 +207,18 @@ def commonAxes(a, bdom, omit=None):
 
 
 def commonGrid(a, b, axes):
-    """commonGrid(a,b,axes) tests if the grids associated with variables a, b are equal,
-    and consistent with the list of axes. If so, the common grid is returned, else None
-    is returned. a and b can be numpy arrays, in which case the result is None.
+    """
+    Parameters
+    ----------
+
+        commonGrid(a,b,axes)
+
+            tests if the grids associated with variables a, b are equal
+            and consistent with the list of axes.
+
+        If so, the common grid is returned, else None is returned.
+
+        a and b can be numpy arrays, in which case the result is None.
 
         The common grid is 'consistent' with axes if the grid axes (e.g., the axes of
         latitude and longitude coordinate variables) are members of the list 'axes'.
@@ -232,8 +267,13 @@ def commonGrid1(a, gb, axes):
 
 class var_binary_operation:
     def __init__(self, mafunc):
-        """ var_binary_operation(mafunc)
-        mafunc is an numpy.ma masked_binary_function.
+        """
+        Parameters
+        ----------
+
+            var_binary_operation(mafunc)
+
+            mafunc is an numpy.ma masked_binary_function.
         """
         self.mafunc = mafunc
         self.__doc__ = mafunc.__doc__
@@ -1015,7 +1055,12 @@ def reshape(a, newshape, axes=None, attributes=None, id=None, grid=None):
 
 
 def resize(a, new_shape, axes=None, attributes=None, id=None, grid=None):
-    """resize(a, new_shape) returns a new array with the specified shape.
+    """resize(a, new_shape)
+
+    Returns
+    -------
+         a new array with the specified shape.
+
     The original array's total size can be any size."""
     ignore, attributes, id, ignore = _extractMetadata(a, axes, attributes, id)
     if axes is not None:
@@ -1031,9 +1076,13 @@ def resize(a, new_shape, axes=None, attributes=None, id=None, grid=None):
 
 def masked_array(a, mask=None, fill_value=None,
                  axes=None, attributes=None, id=None):
-    """masked_array(a, mask=None) =
-       array(a, mask=mask, copy=0, fill_value=fill_value)
-       Use fill_value(a) if None.
+    """
+    Parameters
+    ----------
+         masked_array(a, mask=None) =
+         array(a, mask=mask, copy=0, fill_value=fill_value)
+
+         Use fill_value(a) if None.
     """
     maresult = numpy.ma.masked_array(
         _makeMaskedArg(a),
@@ -1048,10 +1097,14 @@ def masked_array(a, mask=None, fill_value=None,
 def masked_values(data, value, rtol=1.e-5, atol=1.e-8, copy=1,
                   savespace=0, axes=None, attributes=None, id=None):
     """
-       masked_values(data, value, rtol=1.e-5, atol=1.e-8)
-       Create a masked array; mask is None if possible.
-       May share data values with original array, but not recommended.
-       Masked where abs(data-value)<= atol + rtol * abs(value)
+    Parameters
+    ----------
+
+        masked_values(data, value, rtol=1.e-5, atol=1.e-8)
+
+        Create a masked array; mask is None if possible.
+        May share data values with original array, but not recommended.
+        Masked where abs(data-value)<= atol + rtol * abs(value)
     """
     maresult = numpy.ma.masked_values(_makeMaskedArg(
         data), value, rtol=rtol, atol=atol, copy=copy)
@@ -1078,8 +1131,13 @@ def isMaskedVariable(x):
 
 def set_default_fill_value(value_type, value):
     """Set the default fill value for value_type to value.
-    value_type is a string: 'real','complex','character','integer',or 'object'.
-    value should be a scalar or single-element array.
+
+    Parameters
+    ----------
+        value_type is a string:
+            'real','complex','character','integer',or 'object'.
+
+        value should be a scalar or single-element array.
     """
     if value_type == 'real':
         numpy.ma.default_real_fill_value = value
@@ -1099,8 +1157,15 @@ def fromfunction(f, dimensions):
 
 
 def diagonal(a, offset=0, axis1=0, axis2=1):
-    """diagonal(a, offset=0, axis1=0, axis2 = 1) returns the given
-       diagonals defined by the two dimensions of the array.
+    """
+    Parameters
+    ----------
+        diagonal(a, offset=0, axis1=0, axis2 = 1)
+
+    Returns
+    -------
+
+        the given diagonals defined by the two dimensions of the array.
     """
     F = getattr(a, "fill_value", 1.e20)
     return TransientVariable(numpy.ma.diagonal(_makeMaskedArg(a),
diff --git a/Lib/avariable.py b/Lib/avariable.py
index a2fed304..236d2efb 100644
--- a/Lib/avariable.py
+++ b/Lib/avariable.py
@@ -177,8 +177,8 @@ def __call__(self, *args, **kwargs):
         """
         Selection of a subregion using selectors.
 
-        **Parameters:**
-
+        Parameters
+        ----------
             raw:
                 if set to 1, return numpy.ma only
             squeeze:
@@ -188,8 +188,8 @@ def __call__(self, *args, **kwargs):
             order:
                 if given, result is permuted into this order
 
-        **Returns:**
-
+        Returns
+        -------
              Subregion selected
         """
         # separate options from selector specs
@@ -429,12 +429,16 @@ def getConvention(self):
 # A child class may want to override this
     def getAxis(self, n):
         """Get the n-th axis.
+
         Parameters
         ----------
+
             n:
                Axis number
+
         Returns
         -------
+
             if n < 0: n = n + self.rank()
             self.getDomain()[n][0]"""
         if n < 0:
@@ -472,25 +476,24 @@ def hasCellData(self):
         return False
 
     def getAxisListIndex(self, axes=None, omit=None, order=None):
-        """Return a list of indices of axis objects;
-
-           Note
-           ----
-           If axes is **not** `None`, include only certain axes.
-           less the ones specified in omit.
+        """
+        Returns
+        -------
+            a list of indices of axis objects
 
-           If axes is `None`, use all axes of this variable.
+        Note
+        ----
+        If axes is **not** `None`, include only certain axes.
+        less the ones specified in omit.
 
-           Other specificiations are as for axisMatchIndex.
+        If axes is `None`, use all axes of this variable.
 
-        Returns
-        -------
-           a list of indices of axis objects;
+        Other specificiations are as for axisMatchIndex.
         """
         return axisMatchIndex(self.getAxisList(), axes, omit, order)
 
     def getAxisList(self, axes=None, omit=None, order=None):
-        """Get the list of axis objects;
+        """Get the list of axis objects
 
         Note
         ----
@@ -524,9 +527,10 @@ def getMissing(self, asarray=0):
                asarray :
                    '0' : scalar
                    '1' : numpy array
-           Return
-           ------
-               the missing value as a scalar, or as a numpy array if asarray==1"""
+
+           Returns
+           -------
+           the missing value as a scalar, or as a numpy array if asarray==1"""
 
         if hasattr(self, 'missing_value'):
             try:
@@ -695,16 +699,19 @@ def getLongitude(self):
     # Get an order string, such as "tzyx"
     def getOrder(self, ids=0):
         """
-        parameters
+        Parameters
         ----------
-             id:
-                 0 or 1
-        returns
+
+            id:
+                0 or 1
+
+        Returns
         -------
-            the order string, such as t, z, y, x (time, level, lat, lon).
+
+        the order string, such as t, z, y, x (time, level, lat, lon).
 
         Note
-        ----
+
         * if ids == 0 (the default) for an axis that is not t,z,x,y
           the order string will contain a (-) character in that location.
           The result string will be of the same length as the number
@@ -1176,9 +1183,10 @@ def subRegion(self, *specs, **keys):
 
     def getValue(self, squeeze=1):
         """Get the entire set of values.
+
         Returns
         -------
-            All values and elimite the 1-D dimension.
+        All values and elimite the 1-D dimension.
         """
         return self.getSlice(Ellipsis, squeeze=squeeze)
 
diff --git a/Lib/axis.py b/Lib/axis.py
index 41c37c1a..ef051886 100644
--- a/Lib/axis.py
+++ b/Lib/axis.py
@@ -608,16 +608,17 @@ def lookupArray(ar, value):
 
     Parameters
     ----------
-    ar:
-        Input array
-    value:
-        Value to search
+         ar:
+             Input array
+         value:
+             Value to search
+
     Returns
     -------
-        index:
-            * ar is monotonically increasing.
-                * value <= ar[index], index==0..len(ar)-1
-                * value > ar[index], index==len(ar)
+    index:
+        * ar is monotonically increasing.
+        * value <= ar[index], index==0..len(ar)-1
+            * value > ar[index], index==len(ar)
             * ar is monotonically decreasing:
                 * value >= ar[index], index==0..len(ar)-1
                 * value < ar[index], index==len(ar)
@@ -1252,7 +1253,10 @@ def mapInterval(self, interval, indicator='ccn', cycle=None):
         same meaning for the right-hand point. Set cycle to a nonzero value
         to force wraparound.
 
-        Returns the corresponding index interval (i,j), where i<j, indicating
+        Returns
+        -------
+
+            The corresponding index interval (i,j), where i<j, indicating
         the half-open index interval [i,j), or None if the intersection is empty.
 
         For an axis which is circular (self.topology == 'circular'), [i,j)
@@ -1262,11 +1266,12 @@ def mapInterval(self, interval, indicator='ccn', cycle=None):
         (2) if j>N, the interval wraps around, and is equivalent to the
             two consecutive intervals [i,N), [0,j-N)
 
-        For example, if the vector is [0,2,4,...,358] of length 180,
-        and the coordinate interval is [-5,5), the return index interval is
-        [178,183). This is equivalent to the two intervals [178,180) and [0,3).
+        Example:
+          if the vector is [0,2,4,...,358] of length 180,and the coordinate
+          interval is [-5,5), the return index interval is[178,183). This is
+          equivalent to the two intervals [178,180) and [0,3).
 
-.. note::
+         Note:
            if the interval is interior to the axis, but does not span any axis element,
            a singleton (i,i+1) indicating an adjacent index is returned.
         """
@@ -2677,16 +2682,17 @@ def concatenate(axes, id=None, attributes=None):
 
     Parameters
     ----------
-        axes:
-            Axes to concatenate
-        id:
-            New axis identification (default None)
-        attributes:
-            Attributes to attached to the new Axis
+    axes :
+        Axes to concatenate
+    id :
+        New axis identification (default None)
+    attributes :
+        Attributes to attached to the new Axis
 
     Returns
     -------
-        Transient axis."""
+    Transient axis.
+    """
 
     data = numpy.ma.concatenate([ax[:] for ax in axes])
     boundsArray = [ax.getBounds() for ax in axes]
@@ -2699,12 +2705,14 @@ def concatenate(axes, id=None, attributes=None):
 
 def take(ax, indices):
     """Take elements form an array along an axis
+
     Parameters
     ----------
         ax:
             The source array.
         indices:
             The indices of the values to extract.
+
     Returns
     -------
     axis: TransientAxis
diff --git a/Lib/cache.py b/Lib/cache.py
index 7b4a761f..b24d4844 100644
--- a/Lib/cache.py
+++ b/Lib/cache.py
@@ -299,9 +299,10 @@ def __init__(self):
     def get(self, filekey):
         """
         Get the path associated with <filekey>, or None if not present.
-Parameters
-----------
-        <filekey>
+
+        Parameters
+        ----------
+            <filekey>
             filekey for cache
         """
         filekey = str(filekey)
@@ -322,9 +323,10 @@ def get(self, filekey):
     def put(self, filekey, path):
         """
         cache[filekey] = path
-Parameters
-----------
-        <filekey>
+
+        Parameters
+        ----------
+            <filekey>
             filekey for cache
         """
 
@@ -373,8 +375,8 @@ def copyFile(self, fromURL, filekey, lcpath=None,
 
            For request manager transfers, lcpath is the logical collection path,
 
-Parameters
-----------
+        Parameters
+        ----------
 
            <userid>
                is the string user ID,
@@ -428,30 +430,32 @@ def getFile(self, fromURL, filekey, naptime=5, maxtries=60,
 
 
         Parameters
-        ---------
+        ----------
             <naptime>
-               is the number of seconds between retries,
+                is the number of seconds between retries,
 
             <maxtries>
-               is the maximum number of retries. Otherwise, copy it from the remote file.
+                is the maximum number of retries. Otherwise, copy it from the remote file.
 
             <filekey>
-               is the cache index key. A good choice is (datasetDN, filename)
+                is the cache index key. A good choice is (datasetDN, filename)
         where datasetDN is the distinguished name of the dataset, and filename
         is the name of the file within the dataset.
 
             For request manager transfers,
 
             <lcpath>
-               is the logical collection path,
+                is the logical collection path,
 
             <userid>
-               is the user string ID,
+                is the user string ID,
 
              <useReplica>
-               is true iff the request manager should search the replica catalog for the actual file to transfer.
+                is true iff the request manager should search the replica catalog for the actual file to transfer.
 
-        Returns the path of a file in the cache.
+        Returns
+        -------
+            the path of a file in the cache.
 
         Note: The function does not guarantee that the file is still in the cache
         by the time it returns.
diff --git a/Lib/cudsinterface.py b/Lib/cudsinterface.py
index fdc68339..9c435bac 100644
--- a/Lib/cudsinterface.py
+++ b/Lib/cudsinterface.py
@@ -382,24 +382,28 @@ def getattribute(self, vname, attribute):
 
     def getslab(self, vname, *args, **keys):
         """
+        Parameters
+        ----------
 
+            getslab ('name', arg1, arg2, ....)
 
-          getslab ('name', arg1, arg2, ....)
+        Returns
+        -------
 
-           returns a cdms variable containing the data.
+            a cdms variable containing the data.
 
-           Arguments for each dimension can be:
-              (1) : or None -- selected entire dimension
-              (2) Ellipsis -- select entire dimensions between the ones given.
-              (3) a pair of successive arguments giving an interval in
-                  world coordinates.
-              (4) a cdms-style tuple of world coordinates e.g. (start, stop, 'cc')
+            Arguments for each dimension can be:
+                (1) : or None -- selected entire dimension
+                (2) Ellipsis -- select entire dimensions between the ones given.
+                (3) a pair of successive arguments giving an interval in
+                    world coordinates.
+                (4) a cdms-style tuple of world coordinates e.g. (start, stop, 'cc')
 
-        Options
+            Options
 
-            args
-                (*tuple/*cdms2.selectors.Selector) () tuple of type (val1,val2,'cob')
-                for any given dimension or cdms selector
+                 args
+                     (*tuple/*cdms2.selectors.Selector) () tuple of type (val1,val2,'cob')
+                 for any given dimension or cdms selector
 
             Keys
                 squeeze
diff --git a/Lib/database.py b/Lib/database.py
index b96f4118..8df37044 100644
--- a/Lib/database.py
+++ b/Lib/database.py
@@ -52,11 +52,11 @@ def connect(uri=None, user="", password=""):
 
     Returns
     -------
-       Database instance.
+       Database instance
 
     Example
-    -------
-       db = cdms.connect("ldap://dbhost.llnl.gov/database=CDMS,ou=PCMDI,o=LLNL,c=US")
+
+        db = cdms.connect("ldap://dbhost.llnl.gov/database=CDMS,ou=PCMDI,o=LLNL,c=US")
     """
     if uri is None:
         try:
@@ -312,7 +312,7 @@ def openDataset(self, dsetid, mode='r'):
           Dataset instance.
 
         Example
-        -------
+
           dset = db.openDataset('ncep_reanalysis_mo')
         """
         dn = "dataset=%s,%s" % (dsetid, self.path)
@@ -416,7 +416,7 @@ def searchFilter(self, filter=None, tag=None, relbase=None,
               Entries can be refined with searchPredicate().
 
         Example
-        -------
+
         (1) Find all variables named "cli":
 
           result = db.searchFilter(filter="id=cli",tag="variable")
@@ -529,7 +529,7 @@ def searchPredicate(self, predicate, tag=None):
            Entries can be refined with searchPredicate().
 
         Example
-        -------
+
             (1) Find all variables on a 73x96 grid
 
             newresult = result.searchPredicate(lambda obj: obj.getGrid().shape==(73,96),"variable")
@@ -561,11 +561,11 @@ def __init__(self, db):
     def getObject(self):
         """
         Method
-        ------
+
           getObject()
 
         Description
-        -----------
+
           Get the CDMS object associated with this entry.
 
         Returns
diff --git a/Lib/dataset.py b/Lib/dataset.py
index 902aa438..301bdc8d 100644
--- a/Lib/dataset.py
+++ b/Lib/dataset.py
@@ -149,10 +149,11 @@ def setCompressionWarnings(value=None):
 
 def setNetcdfUseNCSwitchModeFlag(value):
     """Tells cdms2 to switch constantly between netcdf define/write modes.
+
        Parameters
        ----------
-          value:
-              0/1, False/True.
+           value:
+               0/1, False/True.
 
        Returns
        -------
@@ -268,6 +269,7 @@ def setNetcdfShuffleFlag(value):
        ----------
           value:
               0/1, False/True.
+
        Returns
        -------
            No return value.
@@ -287,6 +289,7 @@ def setNetcdfDeflateFlag(value):
        ----------
           value:
               0/1, False/True.
+
        Returns
        -------
            No return value.
@@ -333,7 +336,8 @@ def getNetcdfUseParallelFlag():
        Parameters
        ----------
           value:
-              0/1, False/True.
+              0/1, False/True
+
        Returns
        -------
            No return value.
@@ -384,9 +388,10 @@ def getNetcdfDeflateLevelFlag():
 def useNetcdf3():
     """ Turns off (0) NetCDF flags for shuffle/cuDa/deflatelevel
     Output files are generated as NetCDF3 Classic after that
+
     Returns
     -------
-            No return value.
+        No return value.
     """
     setNetcdfShuffleFlag(0)
     setNetcdfDeflateFlag(0)
@@ -467,6 +472,7 @@ def openDataset(uri, mode='r', template=None,
             Default set to 1
         dpath: (str)
             Destination path.
+
     Returns
     -------
          file handle.
@@ -580,6 +586,7 @@ def parselist(text, f):
                Input String.
            f:
                function which parses A and returns (A, nconsumed).
+
        Returns
        -------
            Parser results.
@@ -619,10 +626,11 @@ def parseIndexList(text):
          text:
             i,j,k,l,... are indices or '-', and path is a filename.
             Coerce the indices to integers.
+
     Returns
     -------
-           Parser results.
-           n number of matches.
+        Parser results.
+        n number of matches.
     """
     m = _IndexList4.match(text)
     nindices = 4
@@ -1718,14 +1726,16 @@ def copyGrid(self, grid, newname=None):
 
         Parameters
         ----------
-            newname: (str/None)
-                new name for grid (default None)
-            grid:
-                file grid (cdms2.grid.FileRectGrid/cdms2.hgrid.FileCurveGrid/cdms2.gengrid.FileGenericGrid)
+             newname: (str/None)
+                  new name for grid (default None)
+
+             grid: file grid
+                 (cdms2.grid.FileRectGrid/cdms2.hgrid.FileCurveGrid/cdms2.gengrid.FileGenericGrid)
 
         Returns
         -------
-            file grid (cdms2.grid.FileRectGrid/cdms2.hgrid.FileCurveGrid/cdms2.gengrid.FileGenericGrid)
+            file grid
+                (cdms2.grid.FileRectGrid/cdms2.hgrid.FileCurveGrid/cdms2.gengrid.FileGenericGrid)
 
         """
         if newname is None:
@@ -2337,6 +2347,7 @@ def getVariable(self, id):
 
     def getVariables(self, spatial=0):
         """Get a list of variable objects.
+
         Parameters
         ----------
             spatial:
@@ -2364,6 +2375,7 @@ def getAxis(self, id):
         ----------
             id:
                 id of the axis to get
+
         Returns
         --------
             file axis
diff --git a/Lib/forecast.py b/Lib/forecast.py
index 3f973992..141b445e 100644
--- a/Lib/forecast.py
+++ b/Lib/forecast.py
@@ -17,14 +17,14 @@ def two_times_from_one(t):
     """
     Parameters
     ----------
-
          Input
-             is a time representation, either as the long int used in the cdscan
-             script, or a string in the format "2010-08-25 15:26:00", or as a cdtime comptime
-             (component time) object.
+             is a time representation, either as the long int used in the
+              cdscan script, or a string in the format "2010-08-25 15:26:00", or
+              as a cdtime comptime (component time) object.
 
          Output
-              is the same time, both as a long _and_ as a comptime."""
+             is the same time, both as a long _and_ as a comptime.
+    """
     if t == 0:
         t = 0
     if isinstance(t, string_types):
@@ -60,7 +60,8 @@ def two_times_from_one(t):
 def comptime(t):
     """
     Parameters
-    ---------
+    ----------
+
          Input
               is a time representation, either as the long int used in the cdscan
               script, or a string in the format "2010-08-25 15:26:00", or as a cdtime comptime
@@ -138,7 +139,7 @@ def available_forecasts(dataset_file, path="."):
           through the specified cdscan-generated dataset xml file.
 
     Note
-    ----
+
          The forecasts are given in 64-bit integer format, but can be converted
          to component times with the function two_times_from_one.
          This function may help in choosing the right arguments for initializing
@@ -152,11 +153,11 @@ def available_forecasts(dataset_file, path="."):
 
 
 class forecasts():
-    """represents a set of forecasts
+    """
+    Represents a set of forecasts
 
+    Example
 
-       Example
-       -------
 
              Creates a set of forecasts.  Normally you do it by something like
              f = forecasts( 'file.xml', (min_time, max_time) )
@@ -255,7 +256,7 @@ def time_interval_to_list(self, tlo, thi, openclosed='co'):
     def reduce_inplace(self, min_time, max_time, openclosed='co'):
         """
         Example
-        -------
+
 
              For a forecasts object f, f( min_time, max_time ) will reduce the
              scope of f, to forecasts whose start time t has min_time<=t<max_time.
@@ -365,7 +366,7 @@ def forecast_axis(self, varname, fcss=None):
              a tuple (axis,start,length,true_length) where axis is in the forecast direction.
 
         Note
-        -----
+
              If a list of forecasts be specified, the axis' data will be limited to them."""
         if fcss is None:
             fcss = self.fcs
diff --git a/Lib/grid.py b/Lib/grid.py
index 194d869a..bf6b181c 100644
--- a/Lib/grid.py
+++ b/Lib/grid.py
@@ -280,7 +280,7 @@ def isClose(self, g):
         """
 
         Returns
-        ------
+        -------
 
              1 if g is 'close enough' to self to be considered equal, 0 if not."""
         return 0
@@ -1054,8 +1054,6 @@ def isGrid(grid):
          grid-cdms2:
             contruct to be examined
 
-         _: None
-
     """
     return isinstance(grid, AbstractGrid)
 
diff --git a/Lib/hgrid.py b/Lib/hgrid.py
index eac17c15..b21a4550 100644
--- a/Lib/hgrid.py
+++ b/Lib/hgrid.py
@@ -144,7 +144,10 @@ def hasCoordType(self, coordType):
 
     def checkConvex(self):
         """Check that each cell of the grid is convex in lon-lat space, with nodes defined counter-clockwise.
-        Return a 1D numpy array of cells that fail the cross-product test.
+
+        Returns
+        -------
+            a 1D numpy array of cells that fail the cross-product test.
         """
 
         from numpy import zeros, where, less, logical_or, compress
@@ -198,7 +201,11 @@ def fixCutCells(self, nonConvexCells, threshold=270.0):
         threshold, the cell is considered a cut cell.
 
         On return, the grid boundaries are modified.
-        Return value is a 1D array of indices of cells that cannot be repaired.
+
+        Returns
+        -------
+
+            value is a 1D array of indices of cells that cannot be repaired.
         """
 
         from numpy import take, array
diff --git a/Lib/tvariable.py b/Lib/tvariable.py
index 3a279475..de38a87e 100644
--- a/Lib/tvariable.py
+++ b/Lib/tvariable.py
@@ -160,8 +160,9 @@ def __init__(self, data, typecode=None, copy=1, savespace=0,
         ----------
 
             createVariable
-                (self, data, typecode=None, copy=0, savespace=0, mask=None, fill_value=None, grid=None,
-                axes=None, attributes=None, id=None, dtype=None, order='C') The savespace argument is ignored,
+                (self, data, typecode=None, copy=0, savespace=0, mask=None,
+                fill_value=None, grid=None, axes=None, attributes=None, id=None,
+                dtype=None, order='C') The savespace argument is ignored,
                 for backward compatibility only.
         """
         try:
@@ -581,7 +582,9 @@ def clone(self, copyData=1):
         Returns
         -------
 
-            a copy of self as a transient variable. If copyData is 1 (default), make a separate copy of the data."""
+            a copy of self as a transient variable.
+
+            If copyData is 1 (default), make a separate copy of the data."""
         result = createVariable(self, copy=copyData)
         return result
 
@@ -927,10 +930,16 @@ def isVariable(s):
 
 
 def asVariable(s, writeable=1):
-    """Returns s if s is a Variable; if writeable is 1, return
-       s if s is a TransientVariable. If s is not a variable of
-       the desired type, attempt to make it so and return that.
-       If we fail raise CDMSError
+    """
+    Returns
+    -------
+        s if s is a Variable; if writeable is 1,
+        return s if s is a TransientVariable.
+
+        If s is not a variable of
+        the desired type, attempt to make it so and return that.
+
+        If we fail raise CDMSError
     """
     target_class = AbstractVariable
     if writeable:
diff --git a/chapter1.ipynb b/chapter1.ipynb
index e66059d9..f4448c1f 100644
--- a/chapter1.ipynb
+++ b/chapter1.ipynb
@@ -51,7 +51,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 28,
+   "execution_count": 2,
    "metadata": {},
    "outputs": [
     {
@@ -60,6 +60,14 @@
      "text": [
       "(1, 2, 80, 97)\n"
      ]
+    },
+    {
+     "name": "stderr",
+     "output_type": "stream",
+     "text": [
+      "/software/anaconda53/envs/sphynx/lib/python2.7/site-packages/cdms2/axis.py:826: UserWarning: genutil module not present, was not able to determine if axis is level based on units\n",
+      "  \"genutil module not present, was not able to determine if axis is level based on units\")\n"
+     ]
     }
    ],
    "source": [
@@ -81,7 +89,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 18,
+   "execution_count": 3,
    "metadata": {},
    "outputs": [
     {
@@ -99,9 +107,17 @@
       "   Other axis attributes:\n",
       "      axis: Z\n",
       "      realtopology: linear\n",
-      "   Python id:  0x7fb843f27a10\n",
+      "   Python id:  0x7f71524578d0\n",
       "\n"
      ]
+    },
+    {
+     "name": "stderr",
+     "output_type": "stream",
+     "text": [
+      "/software/anaconda53/envs/sphynx/lib/python2.7/site-packages/numpy/ma/core.py:6649: RuntimeWarning: overflow encountered in power\n",
+      "  result = np.where(m, fa, umath.power(fa, fb)).view(basetype)\n"
+     ]
     }
    ],
    "source": [
@@ -135,7 +151,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 27,
+   "execution_count": 4,
    "metadata": {},
    "outputs": [
     {
@@ -169,7 +185,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 29,
+   "execution_count": 5,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -187,7 +203,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 30,
+   "execution_count": 6,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -204,7 +220,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 32,
+   "execution_count": 7,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -220,14 +236,14 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 33,
+   "execution_count": 8,
    "metadata": {},
    "outputs": [
     {
      "name": "stderr",
      "output_type": "stream",
      "text": [
-      "/software/anaconda53/envs/sphynx/lib/python2.7/site-packages/cdms2/dataset.py:2154: Warning: Files are written with compression and no shuffling\n",
+      "/software/anaconda53/envs/sphynx/lib/python2.7/site-packages/cdms2/dataset.py:2176: Warning: Files are written with compression and no shuffling\n",
       "You can query different values of compression using the functions:\n",
       "cdms2.getNetcdfShuffleFlag() returning 1 if shuffling is enabled, 0 otherwise\n",
       "cdms2.getNetcdfDeflateFlag() returning 1 if deflate is used, 0 otherwise\n",
@@ -282,9 +298,58 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 9,
    "metadata": {},
-   "outputs": [],
+   "outputs": [
+    {
+     "data": {
+      "text/plain": [
+       "[   id: time1\n",
+       "    Designated a time axis.\n",
+       "    units:  months since 1978-12\n",
+       "    Length: 1\n",
+       "    First:  1.0\n",
+       "    Last:   1.0\n",
+       "    Other axis attributes:\n",
+       "       calendar: gregorian\n",
+       "       axis: T\n",
+       "    Python id:  0x7f718865f150,    id: plev\n",
+       "    Designated a level axis.\n",
+       "    units:  hPa\n",
+       "    Length: 2\n",
+       "    First:  200.0\n",
+       "    Last:   850.0\n",
+       "    Other axis attributes:\n",
+       "       axis: Z\n",
+       "       realtopology: linear\n",
+       "    Python id:  0x7f718865f390,    id: latitude1\n",
+       "    Designated a latitude axis.\n",
+       "    units:  degrees_north\n",
+       "    Length: 80\n",
+       "    First:  -88.2884\n",
+       "    Last:   88.2884\n",
+       "    Other axis attributes:\n",
+       "       axis: Y\n",
+       "       realtopology: linear\n",
+       "    Python id:  0x7f718865f3d0,    id: longitude1\n",
+       "    Designated a longitude axis.\n",
+       "    units:  degrees_east\n",
+       "    Length: 97\n",
+       "    First:  -180.0\n",
+       "    Last:   180.0\n",
+       "    Other axis attributes:\n",
+       "       axis: X\n",
+       "       topology: circular\n",
+       "       modulo: 360.0\n",
+       "       realtopology: linear\n",
+       "    Python id:  0x7f715255c650]"
+      ]
+     },
+     "execution_count": 9,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
    "source": [
     "u.getAxisList() "
    ]
@@ -312,9 +377,18 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 10,
    "metadata": {},
-   "outputs": [],
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "[1.]\n",
+      "months since 1978-12\n"
+     ]
+    }
+   ],
    "source": [
     "t = u.getTime()\n",
     "print t[:]\n",
@@ -335,9 +409,17 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 11,
    "metadata": {},
-   "outputs": [],
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "m/s\n"
+     ]
+    }
+   ],
    "source": [
     "u.units='m/s'\n",
     "print u.units"
@@ -360,9 +442,17 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 12,
    "metadata": {},
-   "outputs": [],
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "['name', 'title', 'tileIndex', 'date', 'source', 'time', 'units', 'type']\n"
+     ]
+    }
+   ],
    "source": [
     "print u.attributes.keys()\n"
    ]
@@ -376,9 +466,356 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 13,
    "metadata": {},
-   "outputs": [],
+   "outputs": [
+    {
+     "data": {
+      "text/plain": [
+       "['T',\n",
+       " '_FillValue',\n",
+       " '_TransientVariable__domain',\n",
+       " '_TransientVariable__getMPIType',\n",
+       " '_TransientVariable__getSlab',\n",
+       " '_TransientVariable__mpiComm',\n",
+       " '_TransientVariable__mpiType',\n",
+       " '_TransientVariable__mpiWindows',\n",
+       " '___cdms_internals__',\n",
+       " '__abs__',\n",
+       " '__add__',\n",
+       " '__and__',\n",
+       " '__array__',\n",
+       " '__array_finalize__',\n",
+       " '__array_interface__',\n",
+       " '__array_prepare__',\n",
+       " '__array_priority__',\n",
+       " '__array_struct__',\n",
+       " '__array_ufunc__',\n",
+       " '__array_wrap__',\n",
+       " '__call__',\n",
+       " '__cdms_internals__',\n",
+       " '__class__',\n",
+       " '__complex__',\n",
+       " '__contains__',\n",
+       " '__copy__',\n",
+       " '__deepcopy__',\n",
+       " '__delattr__',\n",
+       " '__delitem__',\n",
+       " '__dict__',\n",
+       " '__div__',\n",
+       " '__divmod__',\n",
+       " '__doc__',\n",
+       " '__eq__',\n",
+       " '__float__',\n",
+       " '__floordiv__',\n",
+       " '__format__',\n",
+       " '__ge__',\n",
+       " '__getattribute__',\n",
+       " '__getitem__',\n",
+       " '__getslice__',\n",
+       " '__getstate__',\n",
+       " '__gt__',\n",
+       " '__hash__',\n",
+       " '__hex__',\n",
+       " '__iadd__',\n",
+       " '__iand__',\n",
+       " '__idiv__',\n",
+       " '__ifloordiv__',\n",
+       " '__ilshift__',\n",
+       " '__imod__',\n",
+       " '__imul__',\n",
+       " '__index__',\n",
+       " '__init__',\n",
+       " '__int__',\n",
+       " '__invert__',\n",
+       " '__ior__',\n",
+       " '__ipow__',\n",
+       " '__irshift__',\n",
+       " '__isub__',\n",
+       " '__iter__',\n",
+       " '__itruediv__',\n",
+       " '__ixor__',\n",
+       " '__le__',\n",
+       " '__len__',\n",
+       " '__long__',\n",
+       " '__lshift__',\n",
+       " '__lt__',\n",
+       " '__mod__',\n",
+       " '__module__',\n",
+       " '__mul__',\n",
+       " '__ne__',\n",
+       " '__neg__',\n",
+       " '__new__',\n",
+       " '__nonzero__',\n",
+       " '__oct__',\n",
+       " '__or__',\n",
+       " '__pos__',\n",
+       " '__pow__',\n",
+       " '__radd__',\n",
+       " '__rand__',\n",
+       " '__rdiv__',\n",
+       " '__rdivmod__',\n",
+       " '__reduce__',\n",
+       " '__reduce_ex__',\n",
+       " '__repr__',\n",
+       " '__rfloordiv__',\n",
+       " '__rlshift__',\n",
+       " '__rmod__',\n",
+       " '__rmul__',\n",
+       " '__ror__',\n",
+       " '__rpow__',\n",
+       " '__rrshift__',\n",
+       " '__rshift__',\n",
+       " '__rsub__',\n",
+       " '__rtruediv__',\n",
+       " '__rxor__',\n",
+       " '__setattr__',\n",
+       " '__setitem__',\n",
+       " '__setmask__',\n",
+       " '__setslice__',\n",
+       " '__setstate__',\n",
+       " '__sizeof__',\n",
+       " '__sqrt__',\n",
+       " '__str__',\n",
+       " '__sub__',\n",
+       " '__subclasshook__',\n",
+       " '__truediv__',\n",
+       " '__unicode__',\n",
+       " '__weakref__',\n",
+       " '__xor__',\n",
+       " '_baseclass',\n",
+       " '_basedict',\n",
+       " '_comparison',\n",
+       " '_data',\n",
+       " '_decodedType',\n",
+       " '_defaulthardmask',\n",
+       " '_defaultmask',\n",
+       " '_delegate_binop',\n",
+       " '_fill_value',\n",
+       " '_getShape',\n",
+       " '_get_data',\n",
+       " '_get_flat',\n",
+       " '_get_mask',\n",
+       " '_get_recordmask',\n",
+       " '_getinternals',\n",
+       " '_getmissing',\n",
+       " '_grid_',\n",
+       " '_hardmask',\n",
+       " '_insert_masked_print',\n",
+       " '_isfield',\n",
+       " '_listatts',\n",
+       " '_mask',\n",
+       " '_missing',\n",
+       " '_node_',\n",
+       " '_optinfo',\n",
+       " '_print_width',\n",
+       " '_print_width_1d',\n",
+       " '_process_specs',\n",
+       " '_returnArray',\n",
+       " '_set_flat',\n",
+       " '_set_mask',\n",
+       " '_set_recordmask',\n",
+       " '_setatts',\n",
+       " '_setinternals',\n",
+       " '_setmissing',\n",
+       " '_sharedmask',\n",
+       " '_single_specs',\n",
+       " '_update_from',\n",
+       " 'all',\n",
+       " 'anom',\n",
+       " 'any',\n",
+       " 'argmax',\n",
+       " 'argmin',\n",
+       " 'argpartition',\n",
+       " 'argsort',\n",
+       " 'ascontiguous',\n",
+       " 'ascontiguousarray',\n",
+       " 'asma',\n",
+       " 'assignValue',\n",
+       " 'astype',\n",
+       " 'attributes',\n",
+       " 'base',\n",
+       " 'baseclass',\n",
+       " 'byteswap',\n",
+       " 'choose',\n",
+       " 'clip',\n",
+       " 'clone',\n",
+       " 'compress',\n",
+       " 'compressed',\n",
+       " 'conj',\n",
+       " 'conjugate',\n",
+       " 'copy',\n",
+       " 'copyAxis',\n",
+       " 'copyDomain',\n",
+       " 'copydimension',\n",
+       " 'count',\n",
+       " 'createattribute',\n",
+       " 'crossSectionRegrid',\n",
+       " 'ctypes',\n",
+       " 'cumprod',\n",
+       " 'cumsum',\n",
+       " 'data',\n",
+       " 'date',\n",
+       " 'decode',\n",
+       " 'deleteattribute',\n",
+       " 'diagonal',\n",
+       " 'dot',\n",
+       " 'dtype',\n",
+       " 'dump',\n",
+       " 'dumps',\n",
+       " 'expertSlice',\n",
+       " 'exposeHalo',\n",
+       " 'fetchHaloData',\n",
+       " 'fill',\n",
+       " 'fill_value',\n",
+       " 'filled',\n",
+       " 'flags',\n",
+       " 'flat',\n",
+       " 'flatten',\n",
+       " 'freeHalo',\n",
+       " 'generateGridkey',\n",
+       " 'generateRectGridkey',\n",
+       " 'getAxis',\n",
+       " 'getAxisIds',\n",
+       " 'getAxisIndex',\n",
+       " 'getAxisList',\n",
+       " 'getAxisListIndex',\n",
+       " 'getConvention',\n",
+       " 'getDomain',\n",
+       " 'getForecast',\n",
+       " 'getForecastTime',\n",
+       " 'getGrid',\n",
+       " 'getGridIndices',\n",
+       " 'getHaloEllipsis',\n",
+       " 'getLatitude',\n",
+       " 'getLevel',\n",
+       " 'getLongitude',\n",
+       " 'getMPIRank',\n",
+       " 'getMPISize',\n",
+       " 'getMissing',\n",
+       " 'getOrder',\n",
+       " 'getRegion',\n",
+       " 'getSlice',\n",
+       " 'getTileIndex',\n",
+       " 'getTime',\n",
+       " 'getValue',\n",
+       " 'get_fill_value',\n",
+       " 'get_imag',\n",
+       " 'get_real',\n",
+       " 'getattribute',\n",
+       " 'getdimattribute',\n",
+       " 'getfield',\n",
+       " 'harden_mask',\n",
+       " 'hardmask',\n",
+       " 'hasCellData',\n",
+       " 'id',\n",
+       " 'ids',\n",
+       " 'imag',\n",
+       " 'info',\n",
+       " 'initDomain',\n",
+       " 'isAbstractCoordinate',\n",
+       " 'isEncoded',\n",
+       " 'iscontiguous',\n",
+       " 'item',\n",
+       " 'itemset',\n",
+       " 'itemsize',\n",
+       " 'listall',\n",
+       " 'listattributes',\n",
+       " 'listdimattributes',\n",
+       " 'listdimnames',\n",
+       " 'mask',\n",
+       " 'matchPattern',\n",
+       " 'matchone',\n",
+       " 'max',\n",
+       " 'mean',\n",
+       " 'min',\n",
+       " 'mini',\n",
+       " 'missing',\n",
+       " 'missing_value',\n",
+       " 'name',\n",
+       " 'nbytes',\n",
+       " 'ndim',\n",
+       " 'newbyteorder',\n",
+       " 'nonzero',\n",
+       " 'parent',\n",
+       " 'partition',\n",
+       " 'pressureRegrid',\n",
+       " 'prod',\n",
+       " 'product',\n",
+       " 'ptp',\n",
+       " 'put',\n",
+       " 'rank',\n",
+       " 'ravel',\n",
+       " 'real',\n",
+       " 'recordmask',\n",
+       " 'reg_specs2slices',\n",
+       " 'regrid',\n",
+       " 'reorder',\n",
+       " 'repeat',\n",
+       " 'reshape',\n",
+       " 'resize',\n",
+       " 'round',\n",
+       " 'searchPattern',\n",
+       " 'searchPredicate',\n",
+       " 'searchone',\n",
+       " 'searchsorted',\n",
+       " 'select',\n",
+       " 'setAxis',\n",
+       " 'setAxisList',\n",
+       " 'setGrid',\n",
+       " 'setMPIComm',\n",
+       " 'setMaskFromGridMask',\n",
+       " 'setMissing',\n",
+       " 'setTileIndex',\n",
+       " 'set_fill_value',\n",
+       " 'setattribute',\n",
+       " 'setdimattribute',\n",
+       " 'setfield',\n",
+       " 'setflags',\n",
+       " 'shape',\n",
+       " 'sharedmask',\n",
+       " 'showdim',\n",
+       " 'shrink_mask',\n",
+       " 'size',\n",
+       " 'soften_mask',\n",
+       " 'sort',\n",
+       " 'source',\n",
+       " 'specs2slices',\n",
+       " 'squeeze',\n",
+       " 'std',\n",
+       " 'std_slab_atts',\n",
+       " 'strides',\n",
+       " 'subRegion',\n",
+       " 'subSlice',\n",
+       " 'sum',\n",
+       " 'swapaxes',\n",
+       " 'take',\n",
+       " 'tileIndex',\n",
+       " 'time',\n",
+       " 'title',\n",
+       " 'toVisit',\n",
+       " 'tobytes',\n",
+       " 'tofile',\n",
+       " 'toflex',\n",
+       " 'tolist',\n",
+       " 'torecords',\n",
+       " 'tostring',\n",
+       " 'trace',\n",
+       " 'transpose',\n",
+       " 'type',\n",
+       " 'typecode',\n",
+       " 'units',\n",
+       " 'unshare_mask',\n",
+       " 'var',\n",
+       " 'variable_count',\n",
+       " 'view']"
+      ]
+     },
+     "execution_count": 13,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
    "source": [
     "dir(u)"
    ]
@@ -409,19 +846,31 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 15,
    "metadata": {},
-   "outputs": [],
+   "outputs": [
+    {
+     "data": {
+      "text/plain": [
+       "variable_31\n",
+       "masked_array(data=[5, --, 9],\n",
+       "             mask=[False,  True, False],\n",
+       "       fill_value=999999)"
+      ]
+     },
+     "execution_count": 15,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
    "source": [
+    "import MV2\n",
     "a = MV2.array([1,2,3]) # Create array a, with no mask\n",
     "b = MV2.array([4,5,6]) # Same for b\n",
     "a+b # variable_... array([5,7,9,]) \n",
     "\n",
     "\n",
     "\n",
-    "\n",
-    "\n",
-    "\n",
     "a[1]=MV2.masked # Mask the second value of a a.mask()\n",
     "a.mask\n",
     "\n",
@@ -442,18 +891,14 @@
     "variables ``missing_value`` attribute. The data and ``missing_value``\n",
     "attribute are then written to the file.\n",
     "\n",
-    "Masking is covered in `Section 2.9 <cdms_2.html#id5>`__. See also the\n",
-    "documentation of the Python Numpy and MA modules, on which ``cdms.MV``\n",
-    "is based, at\n",
-    "\n",
-    "`https://www.numpy.org/ <https://www.numpy.org/>`__."
+    "[https://www.numpy.org/](https://www.numpy.org/)."
    ]
   },
   {
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "File Variables\n",
+    "## File Variables\n",
     "\n",
     "A variable can be obtained either from a file, a collection of files, or\n",
     "as the result of computation. Correspondingly there are three types of\n",
@@ -478,9 +923,20 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 16,
    "metadata": {},
-   "outputs": [],
+   "outputs": [
+    {
+     "data": {
+      "text/plain": [
+       "(1, 2, 80, 97)"
+      ]
+     },
+     "execution_count": 16,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
    "source": [
     "u = f.getVariable('u') # or u=f['u']\n",
     "u.shape \n"
@@ -504,7 +960,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 17,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -536,24 +992,13 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 19,
    "metadata": {},
    "outputs": [],
    "source": [
     "MV2.get_print_limit() # Current limit 1000\n",
     "\n",
-    "smallvar  \n",
-    "\n",
-    "\n",
-    "\n",
-    "\n",
-    "\n",
-    "\n",
-    "\n",
-    "\n",
-    "\n",
-    "MV2.set_print_limit(100)\n",
-    "largevar   "
+    "MV2.set_print_limit(100)\n"
    ]
   },
   {
@@ -565,9 +1010,20 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 20,
    "metadata": {},
-   "outputs": [],
+   "outputs": [
+    {
+     "data": {
+      "text/plain": [
+       "'f'"
+      ]
+     },
+     "execution_count": 20,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
    "source": [
     "u.typecode()"
    ]
@@ -576,7 +1032,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "Dataset Variables\n",
+    "## Dataset Variables\n",
     "\n",
     "The third type of variable, a *dataset variable*, is associated with a\n",
     "*dataset*, a collection of files that is treated as a single file. A\n",
@@ -602,25 +1058,11 @@
     "The metafile **cdsample.xml** is then used like an ordinary data file:"
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "import os\n",
-    "os.system(\"cdscan -x cdsample.xml [uv]*.nc\")\n",
-    "\n",
-    "f = cdms2.open('cdsample.xml')\n",
-    "u = f('u')\n",
-    "u.shape"
-   ]
-  },
   {
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "Grids\n",
+    "## Grids\n",
     "\n",
     "A latitude-longitude grid represents the coordinate information\n",
     "associated with a variable. A grid encapsulates:\n",
@@ -669,71 +1111,75 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 25,
    "metadata": {},
-   "outputs": [],
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "(32, 48)\n",
+      "[[-76.08465554167911 -76.08465554167911 -76.08465554167911 ...\n",
+      "  -76.08465554167911 -76.08465554167911 -76.08465554167911]\n",
+      " [-73.9264184725605 -73.9264184725605 -73.9264184725605 ...\n",
+      "  -73.9264184725605 -73.9264184725605 -73.9264184725605]\n",
+      " [-71.44420823116856 -71.44420823116856 -71.44420823116856 ...\n",
+      "  -71.44420823116856 -71.44420823116856 -71.44420823116856]\n",
+      " ...\n",
+      " [42.32854942878924 42.65822090474772 43.3199021098036 ...\n",
+      "  43.31990190153133 42.658220876191656 42.32854942851401]\n",
+      " [42.70106428805028 43.057314984924034 43.76927818341599 ...\n",
+      "  43.769277959957755 43.057314954110254 42.70106428775246]\n",
+      " [43.03073409838211 43.41264382746999 44.172341649201826 ...\n",
+      "  44.17234141149318 43.412643794488375 43.03073409806216]]\n",
+      "[[-1.3279277494480501 -1.3279277494480501 -1.3279277494480501 ...\n",
+      "  -1.3279277494480501 -1.3279277494480501 -1.3279277494480501]\n",
+      " [-1.290259406553338 -1.290259406553338 -1.290259406553338 ...\n",
+      "  -1.290259406553338 -1.290259406553338 -1.290259406553338]\n",
+      " [-1.2469366651143254 -1.2469366651143254 -1.2469366651143254 ...\n",
+      "  -1.2469366651143254 -1.2469366651143254 -1.2469366651143254]\n",
+      " ...\n",
+      " [0.7387725551255372 0.744526407830922 0.756074923457711 ...\n",
+      "  0.7560749198226742 0.7445264073325248 0.7387725551207336]\n",
+      " [0.7452741659322457 0.751491913555217 0.7639180155219315 ...\n",
+      "  0.7639180116218496 0.7514919130174151 0.7452741659270478]\n",
+      " [0.7510279895669614 0.7576935717849446 0.7709528000943938 ...\n",
+      "  0.7709527959455953 0.7576935712093067 0.7510279895613773]]\n"
+     ]
+    }
+   ],
    "source": [
-    "f = cdms2.open('sampleCurveGrid4.nc')\n",
-    "\n",
+    "# uncomment the line below to donwload \"clt.nc\"\n",
+    "# wget \"https://cdat.llnl.gov/cdat/sample_data/sampleCurveGrid4.nc\"\n",
     "\n",
+    "f = cdms2.open('sampleCurveGrid4.nc')\n",
     "# lat and lon are coordinate axes, but are grouped with data variables\n",
     "f.variables.keys()\n",
-    "\n",
-    "\n",
     "# y and x are index coordinate axes\n",
     "f.axes.keys()\n",
-    "\n",
-    "\n",
     "# Read data for variable sample\n",
     "sample = f('sample')\n",
-    "\n",
     "# The associated grid g is curvilinear\n",
     "g = sample.getGrid()\n",
-    "\n",
     "# The domain of the variable consfigists of index axes\n",
     "sample.getAxisIds()\n",
-    "\n",
-    "\n",
     "# Get the coordinate axes associated with the grid\n",
     "lat = g.getLatitude() # or sample.getLatitude()\n",
     "lon = g.getLongitude() # or sample.getLongitude()\n",
-    "\n",
     "# lat and lon have the same domain, a subset of the domain of 'sample'\n",
     "lat.getAxisIds()\n",
-    "\n",
-    "\n",
     "# lat and lon are variables ...\n",
-    "lat.shape\n",
-    "\n",
-    "\n",
-    "lat  \n",
-    "\n",
-    "\n",
-    "\n",
-    "\n",
-    "\n",
-    "\n",
-    "\n",
-    "\n",
-    "\n",
-    "\n",
-    "\n",
-    "\n",
-    "\n",
-    "\n",
-    "\n",
-    "\n",
-    "\n",
-    "\n",
-    "\n",
-    "lat_in_radians = lat*MV2.pi/180.0"
+    "print(lat.shape)\n",
+    "print(lat)\n",
+    "lat_in_radians = lat*MV2.pi/180.0\n",
+    "print(lat_in_radians)"
    ]
   },
   {
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "Example: A Generic Grid\n",
+    "# Example: A Generic Grid\n",
     "\n",
     "In this example variable zs is defined on a generic grid. Figure 2\n",
     "illustrates the grid, in this case a geodesic grid:"
@@ -741,9 +1187,20 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 26,
    "metadata": {},
-   "outputs": [],
+   "outputs": [
+    {
+     "data": {
+      "text/plain": [
+       "cdms2.coord.TransientAxis2D"
+      ]
+     },
+     "execution_count": 26,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
    "source": [
     "f.variables.keys()\n",
     "\n",
@@ -778,7 +1235,6 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    " Figure 2: Generic Grid\n",
     "\n",
     "Generic grids can be used to represent any of the grid types. The method\n",
     "toGenericGrid can be applied to any grid to convert it to a generic\n",
@@ -789,27 +1245,37 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 29,
    "metadata": {},
-   "outputs": [],
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "('rectgrid:', (46, 72))\n",
+      "('curvegrid:', <TransientCurveGrid, id: grid_6, shape: (46, 72)>)\n",
+      "('genericgrid: ', <TransientGenericGrid, id: grid_2, shape: (3312,)>)\n"
+     ]
+    }
+   ],
    "source": [
-    "f = cdms2.open(cdat_info.get_sampledata_path()+'/clt.nc')\n",
+    "f = cdms2.open('clt.nc')\n",
     "clt = f('clt')\n",
     "rectgrid = clt.getGrid()\n",
-    "rectgrid.shape\n",
+    "print(\"rectgrid:\", rectgrid.shape)\n",
     "\n",
     "curvegrid = rectgrid.toCurveGrid()\n",
-    "curvegrid\n",
+    "print(\"curvegrid:\", curvegrid)\n",
     "\n",
     "genericgrid = curvegrid.toGenericGrid()\n",
-    "genericgrid"
+    "print(\"genericgrid: \", genericgrid)"
    ]
   },
   {
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "Regridding\n",
+    "## Regridding\n",
     "\n",
     "Regridding is the process of mapping variables from one grid to another.\n",
     "CDMS supports two forms of regridding. Which one you use depends on the\n",
@@ -827,7 +1293,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "CDMS Regridder\n",
+    "### CDMS Regridder\n",
     "\n",
     "The built-in CDMS regridder is used to transform data from one\n",
     "rectangular grid to another. For example, to regrid variable ``u`` (from\n",
@@ -836,17 +1302,26 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 31,
    "metadata": {},
-   "outputs": [],
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "('u.shape:', (1, 2, 80, 97))\n",
+      "('U63.shape', (1, 2, 96, 192))\n"
+     ]
+    }
+   ],
    "source": [
     "f = cdms2.open('clt.nc')\n",
     "u = f('u')\n",
-    "u.shape\n",
+    "print(\"u.shape:\", u.shape)\n",
     "\n",
     "t63_grid = cdms2.createGaussianGrid(96)\n",
     "u63 = u.regrid(t63_grid)\n",
-    "u63.shape"
+    "print(\"U63.shape\",u63.shape)"
    ]
   },
   {
@@ -858,17 +1333,28 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 32,
    "metadata": {},
-   "outputs": [],
+   "outputs": [
+    {
+     "ename": "NameError",
+     "evalue": "name 'f2' is not defined",
+     "output_type": "error",
+     "traceback": [
+      "\u001b[0;31m---------------------------------------------------------------------------\u001b[0m",
+      "\u001b[0;31mNameError\u001b[0m                                 Traceback (most recent call last)",
+      "\u001b[0;32m<ipython-input-32-dadfbb344112>\u001b[0m in \u001b[0;36m<module>\u001b[0;34m()\u001b[0m\n\u001b[1;32m      1\u001b[0m \u001b[0mf\u001b[0m \u001b[0;34m=\u001b[0m \u001b[0mcdms2\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mopen\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m'clt.nc'\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m      2\u001b[0m \u001b[0muold\u001b[0m \u001b[0;34m=\u001b[0m \u001b[0mf\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m'u'\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0;32m----> 3\u001b[0;31m \u001b[0munew\u001b[0m \u001b[0;34m=\u001b[0m \u001b[0mf2\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m'uwnd'\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m\u001b[1;32m      4\u001b[0m \u001b[0;32mprint\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m\"uold.shape\"\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0muold\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mshape\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m      5\u001b[0m \u001b[0;34m\u001b[0m\u001b[0m\n",
+      "\u001b[0;31mNameError\u001b[0m: name 'f2' is not defined"
+     ]
+    }
+   ],
    "source": [
     "f = cdms2.open('clt.nc')\n",
     "uold = f('u')\n",
     "unew = f2('uwnd')\n",
-    "uold.shape\n",
-    "\n",
+    "print(\"uold.shape\", uold.shape)\n",
     "unew.shape\n",
-    "\n",
+    "print(\"unew.shape\", unew.shape)\n",
     "t63_grid = unew.getGrid() # Obtain the grid for vnew\n",
     "u63 = uold.regrid(t63_grid)\n",
     "u63.shape"
@@ -878,7 +1364,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "SCRIP Regridder\n",
+    "### SCRIP Regridder\n",
     "\n",
     "To interpolate between any lat-lon grid types, the SCRIP regridder may\n",
     "be used. The SCRIP package was developed at [Los Alamos National\n",
@@ -901,17 +1387,28 @@
     "\n",
     "Steps 1 and 2 need only be done once. The regridder can be used as often\n",
     "as necessary.\n",
-    "\n",
-    "#For example, suppose the source data on a T42 grid is to be mapped to a\n",
-    "#POP curvilinear grid. Assume that SCRIP generated a remapping file named\n",
-    "#rmp_T42_to_POP43_conserv.nc:\n"
+    "\n"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 33,
    "metadata": {},
-   "outputs": [],
+   "outputs": [
+    {
+     "ename": "CDMSError",
+     "evalue": "Cannot open file /software/cdms22/sampleT42Grid.nc (Variable not found)",
+     "output_type": "error",
+     "traceback": [
+      "\u001b[0;31m---------------------------------------------------------------------------\u001b[0m",
+      "\u001b[0;31mCDMSError\u001b[0m                                 Traceback (most recent call last)",
+      "\u001b[0;32m<ipython-input-33-76d20b22c852>\u001b[0m in \u001b[0;36m<module>\u001b[0;34m()\u001b[0m\n\u001b[1;32m      3\u001b[0m \u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m      4\u001b[0m \u001b[0;31m# Get the source variable\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0;32m----> 5\u001b[0;31m \u001b[0mf\u001b[0m \u001b[0;34m=\u001b[0m \u001b[0mcdms2\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mopen\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m'sampleT42Grid.nc'\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m\u001b[1;32m      6\u001b[0m \u001b[0mdat\u001b[0m \u001b[0;34m=\u001b[0m \u001b[0mf\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m'src_array'\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m      7\u001b[0m \u001b[0mf\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mclose\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n",
+      "\u001b[0;32m/software/anaconda53/envs/sphynx/lib/python2.7/site-packages/cdms2/dataset.pyc\u001b[0m in \u001b[0;36mopenDataset\u001b[0;34m(uri, mode, template, dods, dpath, hostObj)\u001b[0m\n\u001b[1;32m    491\u001b[0m             \u001b[0;31m# rank\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m    492\u001b[0m             \u001b[0;32mif\u001b[0m \u001b[0;32mnot\u001b[0m \u001b[0mos\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mpath\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mexists\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mpath\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m:\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0;32m--> 493\u001b[0;31m                 \u001b[0;32mreturn\u001b[0m \u001b[0mCdmsFile\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mpath\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0mmode\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0mmpiBarrier\u001b[0m\u001b[0;34m=\u001b[0m\u001b[0mCdMpi\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m\u001b[1;32m    494\u001b[0m             \u001b[0;32melif\u001b[0m \u001b[0mmode\u001b[0m \u001b[0;34m==\u001b[0m \u001b[0;34m\"w\"\u001b[0m\u001b[0;34m:\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m    495\u001b[0m                 \u001b[0;32mtry\u001b[0m\u001b[0;34m:\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n",
+      "\u001b[0;32m/software/anaconda53/envs/sphynx/lib/python2.7/site-packages/cdms2/dataset.pyc\u001b[0m in \u001b[0;36m__init__\u001b[0;34m(self, path, mode, hostObj, mpiBarrier)\u001b[0m\n\u001b[1;32m   1273\u001b[0m             \u001b[0m_fileobj_\u001b[0m \u001b[0;34m=\u001b[0m \u001b[0mCdunif\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mCdunifFile\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mpath\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0mmode\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m   1274\u001b[0m         \u001b[0;32mexcept\u001b[0m \u001b[0mException\u001b[0m \u001b[0;32mas\u001b[0m \u001b[0merr\u001b[0m\u001b[0;34m:\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0;32m-> 1275\u001b[0;31m             \u001b[0;32mraise\u001b[0m \u001b[0mCDMSError\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m'Cannot open file %s (%s)'\u001b[0m \u001b[0;34m%\u001b[0m \u001b[0;34m(\u001b[0m\u001b[0mpath\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0merr\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m\u001b[1;32m   1276\u001b[0m         \u001b[0mself\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0m_file_\u001b[0m \u001b[0;34m=\u001b[0m \u001b[0m_fileobj_\u001b[0m   \u001b[0;31m# Cdunif file object\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m   1277\u001b[0m         \u001b[0mself\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mvariables\u001b[0m \u001b[0;34m=\u001b[0m \u001b[0;34m{\u001b[0m\u001b[0;34m}\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n",
+      "\u001b[0;31mCDMSError\u001b[0m: Cannot open file /software/cdms22/sampleT42Grid.nc (Variable not found)"
+     ]
+    }
+   ],
    "source": [
     "# Import regrid package for regridder functions\n",
     "import regrid2, cdms2\n",
diff --git a/docs/source/_static/agogo.css_t b/docs/source/_static/agogo.css_t
index 52d4f74e..1c28bb89 100644
--- a/docs/source/_static/agogo.css_t
+++ b/docs/source/_static/agogo.css_t
@@ -19,10 +19,11 @@ table {
 }
 
 tr:nth-child(even){background-color: #f2f2f2}
+tr  td:first-child { font-weight: bold }
 
-th {
-    background-color: #4CAF50;
-    color: white;
+th {    
+    background-color: #01796F;
+    color: #f8f8ba;
 }
 
 body {
@@ -98,7 +99,7 @@ h2 {
 
 a.headerlink {
   visibility: hidden;
-  color: #dddddd;
+   color: #dddddd; 
   padding-left: .3em;
 }
 
@@ -143,6 +144,7 @@ table.field-list th.field-name {
     display: inline-block;
     padding: 1px 8px 1px 5px;
     white-space: nowrap;
+    color: darkblue;
     background-color: rgb(238, 238, 238);
 }
 
@@ -212,7 +214,8 @@ div.header .headertitle {
 }
 
 div.header .headertitle a {
-  color: white;
+  color: #f8f8ba;
+/*  color: white; */
 }
 
 div.header div.rel {
@@ -361,8 +364,9 @@ div.sidebar a:hover, div.header a:hover {
 }
 
 div.sidebar h3 {
-  color: #2e3436;
+  color: #2e3436; 
   text-transform: uppercase;
+  font-weight: bold;
   font-size: 130%;
   letter-spacing: .1em;
 }
@@ -375,14 +379,17 @@ div.sidebar li.toctree-l1 a {
   display: block;
   padding: 1px;
   border: 1px solid #dddddd;
-  background-color: #eeeeec;
+/*  background-color: #eeeeec; */
+  background-color: #01796F;
   margin-bottom: .4em;
   padding-left: 3px;
-  color: #2e3436;
+  /* color: #2e3436; */
+  color: #f8f8ba;
 }
 
 div.sidebar li.toctree-l2 a {
   background-color: transparent;
+  color: #01796F;
   border: none;
   margin-left: 1em;
   border-bottom: 1px solid #dddddd;
@@ -390,6 +397,7 @@ div.sidebar li.toctree-l2 a {
 
 div.sidebar li.toctree-l3 a {
   background-color: transparent;
+  color: #01796F;
   border: none;
   margin-left: 2em;
   border-bottom: 1px solid #dddddd;
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 4bcbd3c2..a7fe858f 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -186,6 +186,7 @@
 # further.  For a list of options available for each theme, see the
 # documentation.
 #html_theme_options = { "stickysidebar" : "true" }
+html_theme_options = { "headerbg" : "#01796F" }
 
 # Add any paths that contain custom themes here, relative to this directory.
 #html_theme_path = []
@@ -194,7 +195,7 @@
 
 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".
-#html_title = None
+html_title = "CDMS Documentation"
 
 # A shorter title for the navigation bar.  Default is the same as html_title.
 #html_short_title = None
diff --git a/docs/source/index.rst b/docs/source/index.rst
index 8092b80a..a02825da 100644
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -3,14 +3,8 @@
    You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.
 
-CDMS documentation
-==================
-
-
 **Version :** |release|
 
-**Table of content:**
-
 .. toctree::
    :numbered: 4
 
@@ -26,7 +20,6 @@ CDMS documentation
    API
 
 
-
 Indices and tables
 ==================
 
diff --git a/docs/source/manual/cdms_1.rst b/docs/source/manual/cdms_1.rst
index 743cb5e1..a30bfdcf 100644
--- a/docs/source/manual/cdms_1.rst
+++ b/docs/source/manual/cdms_1.rst
@@ -256,7 +256,7 @@ In general internal attributes should not be modified directly. One
 exception is the id attribute, the name of the variable. It is used in
 plotting and I/O, and can be set directly.
 
-Masked values
+Masked Values
 ^^^^^^^^^^^^^
 
 Optionally, variables have a mask that represents where data are
@@ -710,7 +710,7 @@ rmp_T42_to_POP43_conserv.nc:
 
 Regridding is discussed in `Chapter 4 <cdms_4.html>`__.
 
-Time types
+Time Types
 ^^^^^^^^^^
 
 CDMS provides extensive support for time values in the cdtime module.
@@ -791,7 +791,7 @@ or string representations can be used:
 
 Time types are described in Chapter 3.
 
-Plotting data
+Plotting Data
 ^^^^^^^^^^^^^
 
 Data read via the CDMS Python interface can be plotted using the vcs
diff --git a/docs/source/manual/cdms_2.rst b/docs/source/manual/cdms_2.rst
index 339d77ef..151c0647 100644
--- a/docs/source/manual/cdms_2.rst
+++ b/docs/source/manual/cdms_2.rst
@@ -324,8 +324,6 @@ external attributes are written, but not the internal attributes.
 
 .. doctest::
 
-Attributes Common to All CDMS Objects
--------------------------------------
 
 Attributes Common to All CDMS Objects
 -------------------------------------
@@ -1031,7 +1029,7 @@ ResultEntry Methods
     "``CdmsObj``", "``getObject()``", "Return the CDMS object associated with this entry.
         **Note:** For many search applications it is unnecessary to access the associated CDMS object. For best performance this function should be used only when necessary, for example, to retrieve data associated with a variable."
 
-Accessing data
+Accessing Data
 --------------------
 
 To access data via CDMS:
@@ -1713,7 +1711,7 @@ Variable Methods
         * In ``(a)-(c)`` and (f), negative numbers are treated as offsets from the end of that dimension, as in normal Python indexing.
         * String ``typecode()`` The Numpy datatype identifier."
 
-Example Get a Region of Data.
+Example Get a Region of Data
 -----------------------------
 
 Variable ta is a function of (time, latitude, longitude). Read data
diff --git a/docs/source/manual/cdms_4.rst b/docs/source/manual/cdms_4.rst
index 0ad2da33..90e6d379 100644
--- a/docs/source/manual/cdms_4.rst
+++ b/docs/source/manual/cdms_4.rst
@@ -350,8 +350,8 @@ convexity, and ‘repaired’ if necessary. Grid cells may appear to be
 nonconvex if they cross a ``0 / 2pi`` boundary. The repair consists of
 shifting the cell vertices to the same side modulo 360 degrees.
 
-_`CDMS Regridder Functions`
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
+CDMS Regridder Functions
+^^^^^^^^^^^^^^^^^^^^^^^^
 
 A CDMS regridder function is an instance of the CDMS ``Regridder``
 class. The function is associated with rectangular input and output
@@ -422,7 +422,8 @@ CDMS Regridder Function
        * A value of 1 or 1.0 indicates that the corresponding data value is to be ignored for purposes of regridding.
        * A value of 0 or 0.0 indicates that the corresponding data value is valid. This is consistent with the convention for masks used by the MV2 module. 
        * A fractional value between 0.0 and 1.0 indicates the fraction of the data value (e.g., the corresponding cell) to be ignored when regridding. This is useful if a variable is regridded first to grid A and then to another grid B; the mask when regridding from A to B would be (1.0 - f) where f is the maskArray returned from the initial grid operation using the ``returnTuple`` argument.
-       * If ``mask`` is two-dimensional of the same shape as the input grid, it overrides the mask of the input grid.  If the mask has more than two dimensions, it must have the same shape as ``array``. In this case, the ``missing`` data value is also ignored. Such an ndimensional mask is useful if the pattern of missing data varies with level (e.g., ocean data) or time. 
+       * If ``mask`` is two-dimensional of the same shape as the input grid, it overrides the mask of the input grid.  
+       * If the ``mask`` has more than two dimensions, it must have the same shape as ``array``. In this case, the ``missing`` data value is also ignored. Such an ndimensional mask is useful if the pattern of missing data varies with level (e.g., ocean data) or time. 
        **Note:** If neither ``missing`` or ``mask`` is set, the default mask is obtained from the mask of the array if any."
    "Array, Array",  "``regridFunction(ar, missing=None, order=None, mask=None, returnTuple=1)``", "If called with the optional ``returnTuple`` argument equal to 1, the function returns a tuple ``dataArray``, ``maskArray``).
        * ``dataArray`` is the result data array.
@@ -595,18 +596,14 @@ Generate an array of zonal mean values.
      >>> f.close()
 
 
+.. csv-table::
+   :header:  "Line", "Notes"
+   :widths:  8, 45
 
-+--------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-| Line   | Notes                                                                                                                                                                                             |
-+========+===================================================================================================================================================================================================+
-| 3      | Get the input grid. Return the area fraction of the source (input) grid cell that participates in the regridding. The array is 1-D, with length equal to the number of cells in the input grid.   |
-+--------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-| 4      | Create a zonal grid. outgrid has the same latitudes as ingrid, and a singleton longitude dimension. createGlobalMeanGrid could be used here to generate a global mean array.                      |
-+--------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-| 5      | Generate the regridder function.                                                                                                                                                                  |
-+--------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-| 6      | Generate the zonal mean array                                                                                                                                                                     |
-+--------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+   "3", "Open a netCDF file for inputGet the input grid. Return the area fraction of the source (input) grid cell that participates in the regridding. The array is 1-D, with length equal to the number of cells in the input grid."
+   "4", "Create a zonal grid. outgrid has the same latitudes as ingrid, and a singleton longitude dimension. createGlobalMeanGrid could be used here to generate a global mean array."
+   "5", "Generate the regridder function."
+   "6", "Generate the zonal mean array."
 
 **Example:**
 
@@ -634,31 +631,22 @@ of the result.
    >>> outmean = add.reduce(ravel(outmask*outweights*outsample)) / add.reduce(ravel(outmask*outweights))
 
 
-+--------+----------------------------------------------------------------------------------------------------------+
-| Line   | Notes                                                                                                    |
-+========+==========================================================================================================+
-| 2      | Create a uniform target grid.                                                                            |
-+--------+----------------------------------------------------------------------------------------------------------+
-| 3      | Get the latitude and longitude weights.                                                                  |
-+--------+----------------------------------------------------------------------------------------------------------+
-| 4      | Generate a 2-D weights array.                                                                            |
-+--------+----------------------------------------------------------------------------------------------------------+
-| 5      | Get the input grid. ``var`` is a 4-D variable.                                                           |
-+--------+----------------------------------------------------------------------------------------------------------+
-| 6      | Get the first horizontal slice from ``var``.                                                             |
-+--------+----------------------------------------------------------------------------------------------------------+
-| 7-8    | Get the input weights, and generate a 2-D weights array.                                                 |
-+--------+----------------------------------------------------------------------------------------------------------+
-| 9      | Set the 2-D input mask.                                                                                  |
-+--------+----------------------------------------------------------------------------------------------------------+
-| 10     | Calculate the input array area-weighted mean.                                                            |
-+--------+----------------------------------------------------------------------------------------------------------+
-| 11     | Create the regridder function.                                                                           |
-+--------+----------------------------------------------------------------------------------------------------------+
-| 12     | Regrid. Because returnTuple is set to 1, the result is a tuple (dataArray, maskArray).                   |
-+--------+----------------------------------------------------------------------------------------------------------+
-| 13     | Calculate the area-weighted mean of the regridded data. mean and outmean should be approximately equal   |
-+--------+----------------------------------------------------------------------------------------------------------+
+.. csv-table::
+   :header:  "Line", "Notes"
+   :widths:  8, 45
+
+   "2", "Create a uniform target grid."
+   "3", "Get the latitude and longitude weights."
+   "4", "Generate a 2-D weights array."
+   "5", "Get the input grid. ``var`` is a 4-D variable."
+   "6", "Get the first horizontal slice from ``var``."
+   "7-8", "Get the input weights, and generate a 2-D weights array."
+   "9", "Set the 2-D input mask."
+   "10", "Calculate the input array area-weighted mean."
+   "11", "Create the regridder function."
+   "12", "Regrid. Because returnTuple is set to 1, the result is a tuple (dataArray, maskArray)."
+   "13", "Calculate the area-weighted mean of the regridded data. mean and outmean should be approximately equal."
+
 
 SCRIP Regridder
 ~~~~~~~~~~~~~~~
diff --git a/docs/source/manual/cdms_6.rst b/docs/source/manual/cdms_6.rst
index 733a7289..2bb8458e 100644
--- a/docs/source/manual/cdms_6.rst
+++ b/docs/source/manual/cdms_6.rst
@@ -51,24 +51,18 @@ The CDML elements are:
 
 CDML Tags
 ^^^^^^^^^                   
+.. csv-table::                            
+   :header: "Tag", "Description"
+   :widths:  30,80
+
+   "attr", "Extra attribute"
+   "axis", "Coordinate axis"
+   "domain", "Axes on which a variable is defined"
+   "domElem", "Element of a variable domain"
+   "linear", "Linearly-spaced axis values"
+   "rectGrid", "Rectilinear Grid"
+   "variable", "Variable"
 
-+------------+---------------------------------------+
-| Tag        | Description                           |
-+============+=======================================+
-| attr       | Extra attribute                       |
-+------------+---------------------------------------+
-| axis       | Coordinate axis                       |
-+------------+---------------------------------------+
-| domain     | Axes on which a variable is defined   |
-+------------+---------------------------------------+
-| domElem    | Element of a variable domain          |
-+------------+---------------------------------------+
-| linear     | Linearly-spaced axis values           |
-+------------+---------------------------------------+
-| rectGrid   | Rectilinear Grid                      |
-+------------+---------------------------------------+
-| variable   | Variable                              |
-+------------+---------------------------------------+
 
 Special Characters
 ~~~~~~~~~~~~~~~~~~
@@ -78,8 +72,6 @@ they must be encoded to avoid confusion with markup:
 
 Special Character Encodings
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
-                                     
-
 +-------------+------------+
 | Character   | Encoding   |
 +=============+============+
diff --git a/docs/source/manual/cdms_7.rst b/docs/source/manual/cdms_7.rst
index 16d17804..0c03d617 100644
--- a/docs/source/manual/cdms_7.rst
+++ b/docs/source/manual/cdms_7.rst
@@ -1,7 +1,7 @@
 CDMS Utilities
 --------------
 
-CdScan: Importing datasets into CDMS
+CdScan: Importing Datasets into CDMS
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Overview
diff --git a/docs/source/manual/cdms_appendix.rst b/docs/source/manual/cdms_appendix.rst
index 2b665fbf..da920791 100644
--- a/docs/source/manual/cdms_appendix.rst
+++ b/docs/source/manual/cdms_appendix.rst
@@ -165,7 +165,7 @@ Dataset
 
 -  The function open is synonymous with openDataset.
 
-cdms module
+Cdms Module
 '''''''''''
 
 -  The following functions were added:
diff --git a/docs/source/manual/docs/cdms_quick_start.pdf b/docs/source/manual/docs/cdms_quick_start.pdf
index b87cbcf9..40ba390f 100644
Binary files a/docs/source/manual/docs/cdms_quick_start.pdf and b/docs/source/manual/docs/cdms_quick_start.pdf differ
diff --git a/docs/source/manual/images/cdms_quick_start.jpg b/docs/source/manual/images/cdms_quick_start.jpg
index 7669fc20..2fe343be 100644
Binary files a/docs/source/manual/images/cdms_quick_start.jpg and b/docs/source/manual/images/cdms_quick_start.jpg differ
diff --git a/regrid2/Lib/crossSection.py b/regrid2/Lib/crossSection.py
index 39ad338e..b5ed2641 100644
--- a/regrid2/Lib/crossSection.py
+++ b/regrid2/Lib/crossSection.py
@@ -545,21 +545,21 @@ def rgrd(self, dataIn, missingValueIn, missingMatch, logYes='yes',
 def checkdimension(x, name):
     """
 
-    **Purpose:**
+    Purpose:
 
-        dimension  checks
-            1. has a len method
-            2. data type is float32
-            3. monotonically increasing vectors
+       dimension  checks
+           1. has a len method
+           2. data type is float32
+           3. monotonically increasing vectors
 
-    **Parameters:**
-
-       x - coordinate vector
-
-       name - coordinate vector ID
+    Parameters
+    ----------
+        x - coordinate vector
 
-    **Returns:**
+        name - coordinate vector ID
 
+    Returns
+    -------
         x, xsize -- dimension vector and its size
     """
 
@@ -709,15 +709,15 @@ def get_latitude_wts_bnds(checklatpass):
 def latitude_bounds(lat_bnds):
     """
 
-       **Purpose:**
+      **Purpose:**
 
           set up the shape and bounds for use by maparea
 
        **Usage:**
 
-       **Returns:**
-
-          tuple ( bn,bs )
+       Returns
+       -------
+           tuple ( bn,bs )
 
     """
 
@@ -751,9 +751,9 @@ def get_region_latitude_wts_bnds(latRegionpass, latType, latSize):
           wts,bnds = get_region_latitude_wts_bnds(latRegion, latType, latSize)
           where latRegion is the regional grid to check
 
-       **Returns:**
-
-          wts, bnds - tuple with weights and bounds
+       Returns
+       -------
+           wts, bnds - tuple with weights and bounds
 
     """
 
@@ -837,9 +837,9 @@ def sectionmask(dataIn, positionIn, maskIn, missingValueIn, missingMatch):
 
           amskin = mask(dataIn, positionIn, maskIn, missingValueIn, missingValueOut, flag2D)
 
-       **Returns:**
-
-          amskin
+       Returns
+       -------
+           amskin
 
     """
     # Logic outline
@@ -1019,9 +1019,9 @@ def sendmsg(msg, value1=None, value2=None):
 
           value - the number associated with the string
 
-       **Returns:**
-
-          return
+       Returns
+       -------
+           return
 
     """
 
@@ -1048,9 +1048,9 @@ def section(latvals, levvals):
 
           the grid coordinate vectors
 
-       **Returns:**
-
-           xsection -- a temerature like cross section
+       Returns
+       -------
+            xsection -- a temerature like cross section
 
     """
 
@@ -1086,9 +1086,9 @@ def rmserror(data1, data2):
           the two data sets
 
 
-       **Returns:**
-
-          rms error
+       Returns
+       -------
+           rms error
 
    """
 
diff --git a/regrid2/Lib/esmf.py b/regrid2/Lib/esmf.py
index f6d49656..c9fd363c 100644
--- a/regrid2/Lib/esmf.py
+++ b/regrid2/Lib/esmf.py
@@ -702,15 +702,15 @@ def getSrcAreas(self, rootPe):
         """
         Get the src grid areas as used by conservative interpolation
 
-        **Parameters:**
-
-             rootPe
-                 None is local areas are returned, otherwise provide rootPe and the data will be gathered
-
+        Parameters
+        ----------
+        rootPe :
+            None is local areas are returned, otherwise provide rootPe and the data will be gathered
 
-        **Returns:**
 
-             numpy array or None if interpolation is not conservative
+        Returns
+        -------
+        numpy array or None if interpolation is not conservative
         """
         if self.srcAreaField is not None:
             return self.srcAreaField.data.T
@@ -720,15 +720,15 @@ def getDstAreas(self, rootPe):
         """
         Get the dst grid areas as used by conservative interpolation
 
-        **Parameters:**
-
-             rootPe
-                 None is local areas are returned, otherwise provide rootPe and the data will be gathered
-
+        Parameters
+        ----------
+            rootPe
+                None is local areas are returned, otherwise provide rootPe and the data will be gathered
 
-        **Returns:**
 
-             numpy array or None if interpolation is not conservative
+        Returns
+        -------
+            numpy array or None if interpolation is not conservative
         """
         if self.srcAreaField is not None:
             return self.dstAreaField.data.T
@@ -738,15 +738,15 @@ def getSrcAreaFractions(self, rootPe):
         """
         Get the source grid fraction areas as used by conservative interpolation
 
-        **Parameters:**
-
-             rootPe
-                 None is local areas are returned, otherwise provide rootPe and the data will be gathered
-
+        Parameters
+        ----------
+            rootPe
+                None is local areas are returned, otherwise provide rootPe and the data will be gathered
 
-        **Returns:**
 
-             numpy array
+        Returns
+        -------
+            numpy array
         """
         if self.srcFracField is not None:
             #            self.srcFracField.get_area()
@@ -757,15 +757,15 @@ def getDstAreaFractions(self, rootPe):
         """
         Get the destination grid fraction areas as used by conservative interpolation
 
-        **Parameters:**
-
-             rootPe
-                 None is local areas are returned, otherwise provide rootPe and the data will be gathered
-
+        Parameters
+        ----------
+            rootPe
+                None is local areas are returned, otherwise provide rootPe and the data will be gathered
 
-        **Returns:**
 
-             numpy array
+        Returns
+        -------
+            numpy array
         """
         if self.dstFracField is not None:
             #            self.dstFracField.get_area()
diff --git a/regrid2/Lib/mvGenericRegrid.py b/regrid2/Lib/mvGenericRegrid.py
index 23786c12..a8ac7b22 100644
--- a/regrid2/Lib/mvGenericRegrid.py
+++ b/regrid2/Lib/mvGenericRegrid.py
@@ -22,13 +22,13 @@ def guessPeriodicity(srcBounds):
     """
     Guess if a src grid is periodic
 
-    **Parameters:**
-
-          srcBounds
-             the nodal src set of coordinates
-
-    **Returns:**
+    Parameters
+    ----------
+        srcBounds
+            the nodal src set of coordinates
 
+    Returns
+    -------
         1 if periodic, warp around, 0 otherwise
     """
     res = 0
@@ -196,10 +196,10 @@ def apply(self, srcData, dstData,
         """
         Regrid source to destination
 
-        **Parameters:**
-
-                srcData
-                    array (input)
+        Parameters
+        ----------
+            srcData
+                array (input)
 
                 dstData
                     array (output)
@@ -343,8 +343,8 @@ def getDstGrid(self):
         Return the destination grid, may be different from the dst grid provided
         to the constructor due to domain decomposition
 
-        **Returns:**
-
+        Returns
+        -------
             local grid on this processor
         """
         return self.tool.getDstGrid()
@@ -353,8 +353,8 @@ def fillInDiagnosticData(self, diag, rootPe=None):
         """
         Fill in diagnostic data
 
-        **Parameters:**
-
+        Parameters
+        ----------
             diag
                 a dictionary whose entries, if present, will be filled entries are tool dependent
 
diff --git a/regrid2/Lib/pressure.py b/regrid2/Lib/pressure.py
index 42b632f2..3fe830d9 100644
--- a/regrid2/Lib/pressure.py
+++ b/regrid2/Lib/pressure.py
@@ -443,8 +443,8 @@ def checkorder(positionIn):
         positionIn -- array with location of longitude, latitude. level and time
          respectively in the sense of the python shape of the data
 
-    **Returns:**
-
+    Returns
+    -------
         newOrder -- tuple to transpose data to the order (t,z,y,x)
 
         inverseOrder -- tuple to transpose data to back to the original order
@@ -490,9 +490,9 @@ def sendmsg(msg, value1=None, value2=None):
 
          value - the number associated with the string
 
-    **Returns:**
-
-         return
+    Returns
+    -------
+        return
 
    """
 
diff --git a/regrid2/Lib/scrip.py b/regrid2/Lib/scrip.py
index ae08e76b..93d364df 100644
--- a/regrid2/Lib/scrip.py
+++ b/regrid2/Lib/scrip.py
@@ -371,14 +371,15 @@ def regrid(self, input):
 def readRegridder(fileobj, mapMethod=None, checkGrid=1):
     """Read a regridder from an open fileobj.
 
-       **Parameters:**
+       Parameters
+       ----------
 
-            mapMethod
-                is one of "conservative", "bilinear", "bicubic", or "distwgt".
+           mapMethod
+               is one of "conservative", "bilinear", "bicubic", or "distwgt".
 
-            If unspecified, it defaults to the method defined in the file.
+           If unspecified, it defaults to the method defined in the file.
 
-            If 'checkGrid' is 1 (default), the grid cells are checked for convexity, and 'repaired' if necessary.
+           If 'checkGrid' is 1 (default), the grid cells are checked for convexity, and 'repaired' if necessary.
 
     """