diff --git a/openbr/gui/imageviewer.cpp b/openbr/gui/imageviewer.cpp
index a0dbe54..5512c78 100644
--- a/openbr/gui/imageviewer.cpp
+++ b/openbr/gui/imageviewer.cpp
@@ -36,7 +36,8 @@ void br::ImageViewer::setDefaultText(const QString &text)
 
 void br::ImageViewer::setImage(const QString &file, bool async)
 {
-    src = QImage(file);
+    if(file.isNull()) src = QImage(); // Gets rid of runtime FileEngine::open warning
+    else src = QImage(file);
     updatePixmap(async);
 }
 
diff --git a/openbr/plugins/distance.cpp b/openbr/plugins/distance.cpp
index e082282..8781197 100644
--- a/openbr/plugins/distance.cpp
+++ b/openbr/plugins/distance.cpp
@@ -298,46 +298,6 @@ class IdenticalDistance : public Distance
 
 BR_REGISTER(Distance, IdenticalDistance)
 
-class HeatMapDistance : public Distance
-{
-    Q_OBJECT
-    Q_PROPERTY(br::Distance* distance READ get_distance WRITE set_distance RESET reset_distance STORED false)
-    BR_PROPERTY(br::Distance*, distance, make("Dist(L2)"))
-    Q_PROPERTY(int rows READ get_rows WRITE set_rows RESET reset_rows STORED false)
-    BR_PROPERTY(int, rows, -1)
-    Q_PROPERTY(int cols READ get_cols WRITE set_cols RESET reset_cols STORED false)
-    BR_PROPERTY(int, cols, -1)
-
-    void train(const TemplateList &src)
-    {
-        distance->train(src);
-    }
-
-
-    float compare(const Template &a, const Template &b) const
-    {
-        qFatal("HeatMap expects a TemplateList");
-
-        (void) a; (void) b;
-    }
-
-   void compare(const TemplateList &target, const TemplateList &query, Output *output) const
-    {
-        if (rows*cols > target.size()) qFatal("Incompatible heatmap comparison dimensionality");
-
-        int index = 0;
-        for (int col = 0; col < cols; col++) {
-            for (int row = 0; row < rows; row++) {
-                float score = distance->compare(target[index],query[index]);
-                output->setRelative(score, row, col);
-                index++;
-            }
-        }
-    }
-};
-
-BR_REGISTER(Distance, HeatMapDistance)
-
 } // namespace br
 
 #include "distance.moc"
diff --git a/openbr/plugins/output.cpp b/openbr/plugins/output.cpp
index eb4e564..fcf1d33 100644
--- a/openbr/plugins/output.cpp
+++ b/openbr/plugins/output.cpp
@@ -97,33 +97,25 @@ BR_REGISTER(Output, csvOutput)
 class heatOutput : public MatrixOutput
 {
     Q_OBJECT
-    Q_PROPERTY(int rows READ get_rows WRITE set_rows RESET reset_rows STORED false)
-    BR_PROPERTY(int, rows, -1)
-    Q_PROPERTY(int cols READ get_cols WRITE set_cols RESET reset_cols STORED false)
-    BR_PROPERTY(int, cols, -1)
+    Q_PROPERTY(int patches READ get_patches WRITE set_patches RESET reset_patches STORED false)
+    BR_PROPERTY(int, patches, -1);
 
     ~heatOutput()
     {
         if (file.isNull() || targetFiles.isEmpty() || queryFiles.isEmpty()) return;
 
-        if (rows*cols > targetFiles.size()) qFatal("Incompatible heatmap output dimensionality");
-
         QStringList lines;
-        for (int col = 0; col < cols; col++) {
-            QStringList words;
-            for (int row = 0; row < rows; row++)
-                words.append(toString(row,col));
-            lines.append(words.join(","));
+        for (int i=0; i<data.rows; i++) {
+            lines.append(toString(i,0));
         }
         QtUtils::writeFile(file, lines);
     }
 
     void initialize(const FileList &targetFiles, const FileList &queryFiles)
     {
-        if (rows == -1 || cols == -1) qFatal("heatOutput requires dimensionality");
-
+        if (patches == -1) qFatal("Heat output requires the number of patches");
         Output::initialize(targetFiles, queryFiles);
-        data.create(rows, cols, CV_32FC1);
+        data.create(patches, 1, CV_32FC1);
     }
 };
 
diff --git a/openbr/plugins/quality.cpp b/openbr/plugins/quality.cpp
index 6d34ff4..b204229 100644
--- a/openbr/plugins/quality.cpp
+++ b/openbr/plugins/quality.cpp
@@ -150,8 +150,7 @@ class MatchProbabilityDistance : public Distance
     Q_OBJECT
     Q_PROPERTY(br::Distance* distance READ get_distance WRITE set_distance RESET reset_distance STORED false)
     Q_PROPERTY(bool gaussian READ get_gaussian WRITE set_gaussian RESET reset_gaussian STORED false)
-    BR_PROPERTY(br::Distance*, distance, make("Dist(L2)"))
-    BR_PROPERTY(bool, gaussian, true)
+    Q_PROPERTY(bool crossModality READ get_crossModality WRITE set_crossModality RESET reset_crossModality STORED false)
 
     MP mp;
 
@@ -160,6 +159,7 @@ class MatchProbabilityDistance : public Distance
         distance->train(src);
 
         const QList<int> labels = src.labels<int>();
+
         QScopedPointer<MatrixOutput> matrixOutput(MatrixOutput::make(FileList(src.size()), FileList(src.size())));
         distance->compare(src, src, matrixOutput.data());
 
@@ -170,6 +170,7 @@ class MatchProbabilityDistance : public Distance
             for (int j=0; j<i; j++) {
                 const float score = matrixOutput.data()->data.at<float>(i, j);
                 if (score == -std::numeric_limits<float>::max()) continue;
+                if (crossModality) if(src[i].file.get<QString>("Modality") == src[j].file.get<QString>("Modality")) continue;
                 if (labels[i] == labels[j]) genuineScores.append(score);
                 else                        impostorScores.append(score);
             }
@@ -196,12 +197,110 @@ class MatchProbabilityDistance : public Distance
         distance->load(stream);
         stream >> mp;
     }
+
+protected:
+    BR_PROPERTY(br::Distance*, distance, make("Dist(L2)"))
+    BR_PROPERTY(bool, gaussian, true)
+    BR_PROPERTY(bool, crossModality, false)
 };
 
 BR_REGISTER(Distance, MatchProbabilityDistance)
 
 /*!
  * \ingroup distances
+ * \brief Match Probability modification for heat maps \cite klare12
+ * \author Scott Klum \cite sklum
+ */
+class HeatMapDistance : public Distance
+{
+    Q_OBJECT
+    Q_PROPERTY(br::Distance* distance READ get_distance WRITE set_distance RESET reset_distance STORED false)
+    Q_PROPERTY(bool gaussian READ get_gaussian WRITE set_gaussian RESET reset_gaussian STORED false)
+    Q_PROPERTY(bool crossModality READ get_crossModality WRITE set_crossModality RESET reset_crossModality STORED false)
+    Q_PROPERTY(int step READ get_step WRITE set_step RESET reset_step STORED false)
+    BR_PROPERTY(br::Distance*, distance, make("Dist(L2)"))
+    BR_PROPERTY(bool, gaussian, true)
+    BR_PROPERTY(bool, crossModality, false)
+    BR_PROPERTY(int, step, 1)
+
+    QList<MP> mp;
+
+    void train(const TemplateList &src)
+    {
+        distance->train(src);
+
+        const QList<int> labels = src.labels<int>();
+
+        QList<TemplateList> patches;
+
+        // Split src into list of TemplateLists of corresponding patches across all Templates
+        for (int i=0; i<step; i++) {
+            TemplateList patchBuffer;
+            for (int j=i; j<src.size(); j+=step) {
+                patchBuffer.append(src[j]);
+            }
+            patches.append(patchBuffer);
+            patchBuffer.clear();
+        }
+
+        QScopedPointer<MatrixOutput> matrixOutput(MatrixOutput::make(FileList(patches[0].size()), FileList(patches[0].size())));
+
+        for (int i=0; i<step; i++) {
+            distance->compare(patches[i], patches[i], matrixOutput.data());
+            QList<float> genuineScores, impostorScores;
+            genuineScores.reserve(step);
+            impostorScores.reserve(step);
+            for (int j=0; j<matrixOutput.data()->data.rows; j++) {
+                for (int k=0; k<j; k++) {
+                    const float score = matrixOutput.data()->data.at<float>(j, k);
+                    if (score == -std::numeric_limits<float>::max()) continue;
+                    if (crossModality) if(src[j*step].file.get<QString>("MODALITY") == src[k*step].file.get<QString>("MODALITY")) continue;
+                    if (labels[j*step] == labels[k*step]) genuineScores.append(score);
+                    else                                                        impostorScores.append(score);
+                }
+            }
+
+            mp.append(MP(genuineScores, impostorScores));
+        }
+    }
+
+    float compare(const Template &target, const Template &query) const
+    {
+        (void) target;
+        (void) query;
+        qFatal("You did this wrong");
+
+        return 0;
+    }
+
+    // Switch this to template list version, use compare(template, template) in
+    // heat map distance, and index into the proper match probability
+    void compare(const TemplateList &target, const TemplateList &query, Output *output) const
+    {
+        for (int i=0; i<step; i++) {
+            float rawScore = distance->compare(target[i],query[i]);
+            if (rawScore == -std::numeric_limits<float>::max()) output->setRelative(rawScore, i, 0);
+            else output->setRelative(mp[i](rawScore, gaussian), i, 0);
+        }
+     }
+
+    void store(QDataStream &stream) const
+    {
+        distance->store(stream);
+        stream << mp;
+    }
+
+    void load(QDataStream &stream)
+    {
+        distance->load(stream);
+        stream >> mp;
+    }
+};
+
+BR_REGISTER(Distance, HeatMapDistance)
+
+/*!
+ * \ingroup distances
  * \brief Linear normalizes of a distance so the mean impostor score is 0 and the mean genuine score is 1.
  * \author Josh Klontz \cite jklontz
  */