diff --git a/openbr/core/bee.cpp b/openbr/core/bee.cpp
index 1d2658c..fb840ca 100644
--- a/openbr/core/bee.cpp
+++ b/openbr/core/bee.cpp
@@ -96,7 +96,7 @@ void BEE::writeSigset(const QString &sigset, const br::FileList &files, bool ign
                 if ((key == "Index") || (key == "Subject")) continue;
                 metadata.append(key+"=\""+QtUtils::toString(file.value(key))+"\"");
             }
-        lines.append("\t<biometric-signature name=\"" + file.name +"\">");
+        lines.append("\t<biometric-signature name=\"" + file.get<QString>("Subject") +"\">");
         lines.append("\t\t<presentation file-name=\"" + file.name + "\" " + metadata.join(" ") + "/>");
         lines.append("\t</biometric-signature>");
     }
diff --git a/openbr/plugins/draw.cpp b/openbr/plugins/draw.cpp
index 7fb0051..01d816a 100644
--- a/openbr/plugins/draw.cpp
+++ b/openbr/plugins/draw.cpp
@@ -50,7 +50,7 @@ class DrawTransform : public UntrainableTransform
         dst.m() = inPlace ? src.m() : src.m().clone();
 
         if (points) {
-            const QList<Point2f> pointsList = OpenCVUtils::toPoints(src.file.points());
+            const QList<Point2f> pointsList = OpenCVUtils::toPoints(src.file.namedPoints() + src.file.points());
             for (int i=0; i<pointsList.size(); i++) {
                 const Point2f &point = pointsList[i];
                 circle(dst, point, 3, color, -1);
diff --git a/openbr/plugins/landmarks.cpp b/openbr/plugins/landmarks.cpp
index 7cfab7a..35be2de 100644
--- a/openbr/plugins/landmarks.cpp
+++ b/openbr/plugins/landmarks.cpp
@@ -294,6 +294,13 @@ class DelaunayTransform : public UntrainableTransform
 
             Rect boundingBox = boundingRect(mappedPoints.toVector().toStdVector());
 
+            boundingBox.x += 0; //boundingBox.width * .05;
+            boundingBox.y += boundingBox.height * .1; // 0.025 for nose, .05 for mouth, .10 for brow
+            boundingBox.width *= 1;//.975;
+            boundingBox.height *= .80; // .975 for nose, .95 for mouth, .925 for brow
+
+            qDebug() << boundingBox;
+
             dst.m() = Mat(dst.m(), boundingBox);
         }
     }
diff --git a/openbr/plugins/register.cpp b/openbr/plugins/register.cpp
index 870dd00..9ff9422 100644
--- a/openbr/plugins/register.cpp
+++ b/openbr/plugins/register.cpp
@@ -86,9 +86,6 @@ private:
             (src.file.contains("Affine_2") || twoPoints)) {
             srcPoints[0] = OpenCVUtils::toPoint(src.file.get<QPointF>("Affine_0"));
             srcPoints[1] = OpenCVUtils::toPoint(src.file.get<QPointF>("Affine_1"));
-
-            dst.file.set("Affine_0", OpenCVUtils::fromPoint(dstPoints[0]));
-            dst.file.set("Affine_1", OpenCVUtils::fromPoint(dstPoints[1]));
             if (!twoPoints) srcPoints[2] = OpenCVUtils::toPoint(src.file.get<QPointF>("Affine_2"));
         } else {
             const QList<Point2f> landmarks = OpenCVUtils::toPoints(src.file.points());
@@ -103,7 +100,6 @@ private:
 
                 dst.file.set("Affine_0", OpenCVUtils::fromPoint(landmarks[0]));
                 dst.file.set("Affine_1", OpenCVUtils::fromPoint(landmarks[1]));
-
                 if (!twoPoints) dst.file.set("Affine_2", OpenCVUtils::fromPoint(landmarks[2]));
             }
         }