diff --git a/src/lib/dglib/CMakeLists.txt b/src/lib/dglib/CMakeLists.txt
index 9e620f9d..8a387323 100644
--- a/src/lib/dglib/CMakeLists.txt
+++ b/src/lib/dglib/CMakeLists.txt
@@ -179,7 +179,6 @@ add_library(dglib
    include/dglib/DgInShapefile.h
    include/dglib/DgInShapefileAtt.h
    include/dglib/DgInputStream.h
-   include/dglib/DgLabelLoc.h
    include/dglib/DgLocBase.h
    include/dglib/DgLocList.h
    include/dglib/DgLocVector.h
diff --git a/src/lib/dglib/include/dglib/DgLabelLoc.h b/src/lib/dglib/include/dglib/DgLabelLoc.h
deleted file mode 100644
index 96d89d31..00000000
--- a/src/lib/dglib/include/dglib/DgLabelLoc.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
-    Copyright (C) 2023 Kevin Sahr
-
-    This file is part of DGGRID.
-
-    DGGRID is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    DGGRID is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*******************************************************************************/
-////////////////////////////////////////////////////////////////////////////////
-//
-// DgLabelLoc.h: DgLabelLoc class definitions
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#ifndef DGLABELLOC_H
-#define DGLABELLOC_H
-
-#include <dglib/DgRFBase.h>
-
-#include <iostream>
-#include <string>
-
-using namespace std;
-
-////////////////////////////////////////////////////////////////////////////////
-class DgLabelLoc {
-
-   public:
-
-      DgLabel (DgLocBase& locIn, string labelIn = "")
-         : location_ (locIn), label_ (labelIn) { }
-
-      const string& label (void) const { return label_; }
-      const DgLocBase& location (void) const { return location_; }
-
-      void setLabel (const string& labelIn) { label_ = labelIn; }
-      void setLocation (DgLocBase& locIn) { label_ = &locIn; }
-
-
-};
-
-////////////////////////////////////////////////////////////////////////////////
-inline ostream& operator<< (ostream& stream, const DgLabel& label)
-            { return stream << label.label(); }
-
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-class DgLabelLocBase : public DgLocBase, public DgLabel {
-
-   public:
-
-
-
-};
-
-////////////////////////////////////////////////////////////////////////////////
-#endif
diff --git a/src/lib/dglib/include/dglib/DgPhysicalRF.h b/src/lib/dglib/include/dglib/DgPhysicalRF.h
index d2fa3113..133c6dae 100644
--- a/src/lib/dglib/include/dglib/DgPhysicalRF.h
+++ b/src/lib/dglib/include/dglib/DgPhysicalRF.h
@@ -37,7 +37,7 @@ template<class A, class C, class B, class DB> class DgPhysicalRF
 
    public:
 
-      DgPhysicalRF<A, C> (const DgBoundedRF<A, B, DB>& rfIn)
+      DgPhysicalRF<A, C, B, DB> (const DgBoundedRF<A, B, DB>& rfIn)
           : DgPhysicalRFBase<C> (rfIn), boundedRF_ (rfIn) { }
 
       const DgBoundedRF<A, B, DB>& boundedRF (void) const { return boundedRF_; }
diff --git a/src/lib/dglib/include/dglib/DgPhysicalRFBase.h b/src/lib/dglib/include/dglib/DgPhysicalRFBase.h
index a2571df7..5a3927ee 100644
--- a/src/lib/dglib/include/dglib/DgPhysicalRFBase.h
+++ b/src/lib/dglib/include/dglib/DgPhysicalRFBase.h
@@ -36,7 +36,7 @@ template<class C> class DgPhysicalRFBase {
 
    public:
 
-      DgPhysicalRFBase (const DgBoundedRFBase& rfIn)
+      DgPhysicalRFBase<C> (const DgBoundedRFBase& rfIn)
           : boundedRFBase_ (rfIn) { }
 
       virtual ~DgPhysicalRFBase (void);
diff --git a/src/lib/dglib/include/dglib/DgSpatialDB.h b/src/lib/dglib/include/dglib/DgSpatialDB.h
index 5cf41aac..edf6b562 100644
--- a/src/lib/dglib/include/dglib/DgSpatialDB.h
+++ b/src/lib/dglib/include/dglib/DgSpatialDB.h
@@ -89,7 +89,7 @@ template<class C> class DgSpatialDB {
 
       const DgPhysicalRFBase<C>& physRF (void) const { return physicalRF_; }
 
-      const DgBoundedRFBase& boundedRF (void) const
+      const DgBoundedRFBase0& boundedRF (void) const
                      { return physicalRF_.boundedRFBase(); }
 
       const DgRFBase& rf (void) const { return boundedRF().rf(); }
diff --git a/src/lib/dglib/lib/DgPhysicalRF.hpp b/src/lib/dglib/lib/DgPhysicalRF.hpp
index ca3639b9..cdb7eb60 100644
--- a/src/lib/dglib/lib/DgPhysicalRF.hpp
+++ b/src/lib/dglib/lib/DgPhysicalRF.hpp
@@ -22,15 +22,15 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-template<class A, class C> void
-DgPhysicalRF<A, C>::deleteContents (const DgLocation& loc, bool convert)
+template<A, C, B, DB> void
+DgPhysicalRF<A, C, B, DB>::deleteContents (const DgLocation& loc, bool convert)
 {
    DgLocation* pLoc = discRF().createLocation(loc, convert);
    const A* add = discRF().getAddress(*pLoc);
 
    if (!boundedRF().validAddress(*add))
    {
-      report("DgPhysicalRF<A, C>::deleteContents() invalid address",
+      report("DgPhysicalRF<A, C, B, DB>::deleteContents() invalid address",
              DgBase::Fatal);
    }
 
@@ -38,11 +38,11 @@ DgPhysicalRF<A, C>::deleteContents (const DgLocation& loc, bool convert)
 
    delete pLoc;
 
-} // void DgPhysicalRF<A, C>::deleteContents
+} // void DgPhysicalRF<A, C, B, DB>::deleteContents
 
 ////////////////////////////////////////////////////////////////////////////////
-template<class A, class C> C*
-DgPhysicalRF<A, C>::getContents (const DgLocation& loc, bool convert,
+template<class A, class C, class B, class DB> C*
+DgPhysicalRF<A, C, B, DB>::getContents (const DgLocation& loc, bool convert,
                                        bool allocate) const
 {
    DgLocation* pLoc = discRF().createLocation(loc, convert);
@@ -51,7 +51,7 @@ DgPhysicalRF<A, C>::getContents (const DgLocation& loc, bool convert,
    if (!boundedRF().validAddress(*add)) return (C*) 0;
 /*
    {
-      report("DgPhysicalRF<A, C>::getContents() invalid address",
+      report("DgPhysicalRF<A, C, B, DB>::getContents() invalid address",
              DgBase::Fatal);
    }
 */
@@ -62,11 +62,11 @@ DgPhysicalRF<A, C>::getContents (const DgLocation& loc, bool convert,
 
    return cont;
 
-} // C* DgPhysicalRF<A, C>::getContents
+} // C* DgPhysicalRF<A, C, B, DB>::getContents
 
 ////////////////////////////////////////////////////////////////////////////////
-template<class A, class C> void
-DgPhysicalRF<A, C>::replaceContents (const DgLocation& loc, C* cont,
+template<class A, class C, class B, class DB> void
+DgPhysicalRF<A, C, B, DB>::replaceContents (const DgLocation& loc, C* cont,
                                         bool convert)
 {
    DgLocation* pLoc = discRF().createLocation(loc, convert);
@@ -74,7 +74,7 @@ DgPhysicalRF<A, C>::replaceContents (const DgLocation& loc, C* cont,
 
    if (!boundedRF().validAddress(*add))
    {
-      report("DgPhysicalRF<A, C>::replaceContents() invalid address",
+      report("DgPhysicalRF<A, C, B, DB>::replaceContents() invalid address",
              DgBase::Fatal);
    }
 
@@ -82,11 +82,11 @@ DgPhysicalRF<A, C>::replaceContents (const DgLocation& loc, C* cont,
 
    delete pLoc;
 
-} // void DgPhysicalRF<A, C>::setContents
+} // void DgPhysicalRF<A, C, B, DB>::setContents
 
 ////////////////////////////////////////////////////////////////////////////////
-template<class A, class C> void
-DgPhysicalRF<A, C>::setContents (const DgLocation& loc, const C& cont,
+template<class A, class C, class B, class DB> void
+DgPhysicalRF<A, C, B, DB>::setContents (const DgLocation& loc, const C& cont,
                                     bool convert)
 {
    DgLocation* pLoc = discRF().createLocation(loc, convert);
@@ -94,7 +94,7 @@ DgPhysicalRF<A, C>::setContents (const DgLocation& loc, const C& cont,
 
    if (!boundedRF().validAddress(*add))
    {
-      report("DgPhysicalRF<A, C>::setContents() invalid address",
+      report("DgPhysicalRF<A, C, B, DB>::setContents() invalid address",
              DgBase::Fatal);
    }
 
@@ -102,7 +102,7 @@ DgPhysicalRF<A, C>::setContents (const DgLocation& loc, const C& cont,
 
    delete pLoc;
 
-} // void DgPhysicalRF<A, C>::setContents
+} // void DgPhysicalRF<A, C, B, DB>::setContents
 
 ////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/lib/dglib/lib/DgPhysicalRF2D.hpp b/src/lib/dglib/lib/DgPhysicalRF2D.hpp
index 698a5027..0baca2b3 100644
--- a/src/lib/dglib/lib/DgPhysicalRF2D.hpp
+++ b/src/lib/dglib/lib/DgPhysicalRF2D.hpp
@@ -27,7 +27,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 template<class C>
 DgPhysicalRF2D<C>::DgPhysicalRF2D (const DgBoundedRF2D& rfIn, bool allocate)
-   : DgPhysicalRF<DgIVec2D, C> (rfIn), boundedRF2D_ (rfIn)
+   : DgPhysicalRF<DgIVec2D, C, DgDVec2D, long double> (rfIn), boundedRF2D_ (rfIn)
 {
    matrix_ = new (C (**[boundedRF2D().numI()]));
    for (int i = 0; i < boundedRF2D().numI(); i++)
diff --git a/src/lib/dglib/lib/DgPhysicalRFS2D.hpp b/src/lib/dglib/lib/DgPhysicalRFS2D.hpp
index 56ff67c8..54cb4127 100644
--- a/src/lib/dglib/lib/DgPhysicalRFS2D.hpp
+++ b/src/lib/dglib/lib/DgPhysicalRFS2D.hpp
@@ -24,7 +24,8 @@
 
 template<class C>
 DgPhysicalRFS2D<C>::DgPhysicalRFS2D (const DgBoundedRFS2D& rfIn, bool allocate)
-   : DgPhysicalRF<DgResAdd<DgIVec2D>, C> (rfIn), boundedRFS2D_ (rfIn)
+   : DgPhysicalRF<DgResAdd<DgIVec2D>, C, DgDVec2D, long double> (rfIn), 
+     boundedRFS2D_ (rfIn)
 {
    int nRes = rfIn.grids().size();