diff --git a/out/production/EPQ 3D renderer/Face.class b/out/production/EPQ 3D renderer/Face.class
index d1c181a..4abdb4e 100644
--- a/out/production/EPQ 3D renderer/Face.class
+++ b/out/production/EPQ 3D renderer/Face.class
Binary files differ
diff --git a/out/production/EPQ 3D renderer/Matrix.class b/out/production/EPQ 3D renderer/Matrix.class
index 5897f80..7b2526a 100644
--- a/out/production/EPQ 3D renderer/Matrix.class
+++ b/out/production/EPQ 3D renderer/Matrix.class
Binary files differ
diff --git a/out/production/EPQ 3D renderer/Object3d.class b/out/production/EPQ 3D renderer/Object3d.class
index 7e0b039..95c5e2b 100644
--- a/out/production/EPQ 3D renderer/Object3d.class
+++ b/out/production/EPQ 3D renderer/Object3d.class
Binary files differ
diff --git a/out/production/EPQ 3D renderer/Screen.class b/out/production/EPQ 3D renderer/Screen.class
index 4df8c31..2324799 100644
--- a/out/production/EPQ 3D renderer/Screen.class
+++ b/out/production/EPQ 3D renderer/Screen.class
Binary files differ
diff --git a/out/production/EPQ 3D renderer/Triangle.class b/out/production/EPQ 3D renderer/Triangle.class
index b9daefa..6a9649d 100644
--- a/out/production/EPQ 3D renderer/Triangle.class
+++ b/out/production/EPQ 3D renderer/Triangle.class
Binary files differ
diff --git a/src/Face.java b/src/Face.java
index 8879a50..3017d0d 100644
--- a/src/Face.java
+++ b/src/Face.java
@@ -89,9 +89,9 @@
                             (0.1+gradX*point.getRotatedPoint().x-point.getRotatedPoint().z)/gradX,
                             (0.1+gradY*point.getRotatedPoint().y-point.getRotatedPoint().z)/gradY,
                             0.1));
-                    if(Double.isFinite(gradX)){
+                    if(!Double.isFinite(gradX)){
                         newPoints.get(newPoints.size() - 1).point.x = point.getRotatedPoint().x;}
-                    if(Double.isFinite(gradY)){
+                    if(!Double.isFinite(gradY)){
                         newPoints.get(newPoints.size() - 1).point.y = point.getRotatedPoint().y;}
                 }
                 // finally - if the current point is valid, then add it to the list
@@ -101,17 +101,21 @@
                             point.getRotatedPoint().y,
                             point.getRotatedPoint().z));
                 }
+                lastPoint = point;
                 lastValid = thisValid;
             }
-            // finished fixing points, now we need to create a new face consisting of those points.
-            fixedFace.points = newPoints.toArray(new PointComp[0]);
-            fixedFace.separateTris();
-            // invalidate all the points so they are actually calculated
-            for (PointComp point:
-                 newPoints) {
-                point.invalidate();
+            // there must be at least 3 points in the face for it to be drawn successfully
+            if(newPoints.size() >= 3) {
+                // finished fixing points, now we need to create a new face consisting of those points.
+                fixedFace.points = newPoints.toArray(new PointComp[0]);
+                fixedFace.separateTris();
+                // invalidate all the points so they are actually calculated
+                for (PointComp point :
+                        newPoints) {
+                    point.invalidate();
+                }
+                fixedFace.draw(img, zBuf, debugImg, fixedFace.perspectiveMappingMatrix, FPDis, scrX, scrY);
             }
-            fixedFace.draw(img, zBuf, debugImg, fixedFace.perspectiveMappingMatrix, FPDis, scrX, scrY);
         }
         return numberOfPixels;
     }
diff --git a/src/Line2d.java b/src/Line2d.java
index ab1cff6..3e03428 100644
--- a/src/Line2d.java
+++ b/src/Line2d.java
@@ -6,7 +6,7 @@
     public Point2D point1;
     public Point2D point2;
 
-    public boolean isDrawn = true;
+    public boolean isDrawn;
 
     // initializer variables
     boolean is_initialised =  false;
@@ -59,7 +59,7 @@
 
     /**
      * Performs the initial calculations required to draw the line
-     * Is automatically called whenever nextpix() or draw() are called when initialise() has not run.
+     * Is automatically called whenever nextPix() or draw() are called when initialise() has not run.
      */
     public void initialise(){
         // initialise brensenham algorithm
@@ -131,7 +131,7 @@
         iteratorVal += 1;
         return returnVal;
     }
-    public double getZval(int x){
+    public double getZVal(int x){
         return realPoint1.z + (gradient * (x - realPoint1.x));
     }
     }
diff --git a/src/Matrix.java b/src/Matrix.java
index 4480cc9..68d2892 100644
--- a/src/Matrix.java
+++ b/src/Matrix.java
@@ -19,15 +19,15 @@
     public void setItems(double[][] newItems){
         items = newItems;
     }
-    public Matrix multiplyGetResult(Matrix mult) {
-        Matrix result = new Matrix(mult.x, this.y);
+    public Matrix multiplyGetResult(Matrix multiplier) {
+        Matrix result = new Matrix(multiplier.x, this.y);
         double newItem;
-        if(x==mult.y){
+        if(x== multiplier.y){
             for(int rx = 0; rx< result.x; rx+=1){
                 for(int ry = 0; ry< result.y; ry+=1){
                     newItem = 0;
                     for(int i = 0; i<x; i+=1){
-                        newItem += this.getItem(i, ry)*mult.getItem(rx, i);
+                        newItem += this.getItem(i, ry)* multiplier.getItem(rx, i);
                     }
                     result.setItem(rx, ry, newItem);
             }}
@@ -36,15 +36,15 @@
         }
         return result;
     }
-    public void multiply(Matrix mult) {
-        Matrix result = new Matrix(mult.x, this.y);
+    public void multiply(Matrix multiplier) {
+        Matrix result = new Matrix(multiplier.x, this.y);
         double newItem;
-        if(x==mult.y){
+        if(x== multiplier.y){
             for(int rx = 0; rx< result.x; rx+=1){
                 for(int ry = 0; ry< result.y; ry+=1){
                     newItem = 0;
                     for(int i = 0; i<x; i+=1){
-                        newItem += this.getItem(i, ry)*mult.getItem(rx, i);
+                        newItem += this.getItem(i, ry)* multiplier.getItem(rx, i);
                     }
                     result.setItem(rx, ry, newItem);
                 }}
@@ -64,7 +64,7 @@
             result.z = point.x * getItem(0,2) + point.y* getItem(1,2) + point.z* getItem(2,2) + getItem(3,2);
         } else {throw new RuntimeException("wrong-dimensions");}
     }
-    public void multiplyPoint2to(Point2D point, Point2D result) throws Exception {
+    public void multiplyPoint2to(Point2D point, Point2D result) {
         if(x==2){
             result.x = (int)(point.x * getItem(0,0) + point.y* getItem(0,1));
             result.y = (int)(point.x * getItem(1,0) + point.y* getItem(1,1));
diff --git a/src/Object3d.java b/src/Object3d.java
index 4af70b0..e6891dc 100644
--- a/src/Object3d.java
+++ b/src/Object3d.java
@@ -1,6 +1,3 @@
-import sun.font.TrueTypeFont;
-
-import java.awt.*;
 import java.awt.image.BufferedImage;
 
 public class Object3d {
@@ -29,7 +26,7 @@
             face.invalidate();
         }
     }
-    public void draw(BufferedImage img, BufferedImage zBuf, BufferedImage debugimg, Matrix camMatrix, double FPDis, int scrX, int scrY, Point3D playerPos){
+    public void draw(BufferedImage img, BufferedImage zBuf, BufferedImage debugImg, Matrix camMatrix, double FPDis, int scrX, int scrY, Point3D playerPos){
         int iterator = 0;
         for (Face face:
              faces) {
@@ -39,9 +36,9 @@
             camVec.createFrom2Points(playerPos, face.points[0].point);
             int numberOfPixels = 0;
             if(face.normal.angleTo(camVec) <= Math.PI/2-0.01){
-                numberOfPixels = face.draw(img, zBuf, debugimg, camMatrix, FPDis, scrX, scrY);
+                numberOfPixels = face.draw(img, zBuf, debugImg, camMatrix, FPDis, scrX, scrY);
             }
-            debugimg.getGraphics().drawString(iterator + ": " +numberOfPixels , 10, 20 + 10*iterator);
+            debugImg.getGraphics().drawString(iterator + ": " +numberOfPixels , 10, 20 + 10*iterator);
             iterator += 1;
         }
     }
@@ -85,7 +82,6 @@
                 (pointA.y + pointB.y)/2,
                 (pointA.z + pointB.z)/2);
         boundingSphereR = Math.sqrt(distance)/2;
-        boolean valid = false;
         for (PointComp point:
                 points) {
             distance = Math.sqrt(
diff --git a/src/Screen.java b/src/Screen.java
index f14a627..db4b147 100644
--- a/src/Screen.java
+++ b/src/Screen.java
@@ -1,8 +1,6 @@
 import java.awt.*;
 import java.awt.event.*;
 import java.awt.image.BufferedImage;
-import java.awt.image.ComponentColorModel;
-import java.awt.image.DataBuffer;
 import javax.swing.*;
 
 public class Screen extends JPanel implements ActionListener, KeyListener, MouseListener, MouseMotionListener {
@@ -16,14 +14,21 @@
     public ObjectCollection mainCollection;
 
         // testing\
-    //private Line2d line = new Line2d(new Point2D(200, 200),new Point2D(1, 1));
-    //private Triangle Triangle = new Triangle(new Point2D(200, 200), new Point2D(1, 1), new Point2D(400,200));
-    private Point3D[] points = new Point3D[]{
-            new Point3D(10,10,-1),
-        new Point3D(-10, 10, -1),
-        new Point3D(-10, -10, -1),
-        new Point3D(10, -10, -1)};
-    double ang = 0;
+//    private Line2d line = new Line2d(
+//            new Point2D(200, 200),
+//                new Point2D(1, 1),
+//                true);
+//    private Triangle Triangle = new Triangle(
+//            new Point2D(200, 200), new Point2D(1, 1), new Point2D(400,200)
+//    ,new boolean[]{false, false, false},
+//            null,
+//            new Matrix(3, 3));
+//    private final Point3D[] points = new Point3D[]{
+//            new Point3D(10,10,-1),
+//        new Point3D(-10, 10, -1),
+//        new Point3D(-10, -10, -1),
+//        new Point3D(10, -10, -1)};
+    // double ang = 0;
     // __config variables__
     // controls the delay between each tick in ms
     private final int DELAY = 25;
diff --git a/src/Triangle.java b/src/Triangle.java
index 99f134a..df4f9f1 100644
--- a/src/Triangle.java
+++ b/src/Triangle.java
@@ -151,8 +151,8 @@
     }
     private void drawPix(BufferedImage img, BufferedImage zBuf, char currentLine, int x, int y, int y1, int y2){
         // find Z coordinate of pixel
-        double z1 = LineLong.getZval(x); double z2;
-        if(currentLine=='A'){z2=LineA.getZval(x);} else{z2=LineB.getZval(x);}
+        double z1 = LineLong.getZVal(x); double z2;
+        if(currentLine=='A'){z2=LineA.getZVal(x);} else{z2=LineB.getZVal(x);}
         double ZVal = z1 + ((z1-z2)/ (y1-y2) * (y - y1));
 
         // a value of 0 represents a value which is on the camera, at z=0.
@@ -161,9 +161,9 @@
         // if the new Z value is greater than the existing Z value on the buffer, the new pixel is calculated and drawn
         // System.out.println("nZ: " + newZ + " zBuf: " + zBuf.getRGB(x, y) + "Bl: " + Color.HSBtoRGB(0, 0, 0));
         if(zBuf.getRGB(x, y) == Color.HSBtoRGB(0, 0, 0) ||
-        newZ > (int)zBuf.getRGB(x, y)){ //newZ > zBuf.getRGB(x, y) ||
+        newZ > zBuf.getRGB(x, y)){ //newZ > zBuf.getRGB(x, y) ||
             zBuf.setRGB(x, y, newZ);
-            double[] result = perspectiveMappingMatrix.multiplyPoint2raw(x, y);
+            // double[] result = perspectiveMappingMatrix.multiplyPoint2raw(x, y);
 //        img.setRGB(x, y, texture.getRGB(
 //                Math.floorMod((int)(result[0]), texture.getWidth()),
 //                Math.floorMod((int)(result[1]), texture.getHeight())));