diff --git a/src/GUI/DrawingArea.java b/src/GUI/DrawingArea.java
index 570ad5be5b0b3baa149f588c4c3db4b86457b402..a670fea18a7073dd8c5ce08804bea484a2bddb71 100644
--- a/src/GUI/DrawingArea.java
+++ b/src/GUI/DrawingArea.java
@@ -116,6 +116,7 @@ public class DrawingArea extends JPanel implements MouseMotionListener, MouseLis
 /// Eraser has no border color ///
             Color borderColor = currentMode != Mode.ERASE ? shapeColor : Color.WHITE;
             g2.setColor(borderColor);
+            g2.setStroke(lineStroke);
             g2.draw(drawing);
         }
     }
diff --git a/src/server/DrawingController.java b/src/server/DrawingController.java
index ce95c36a5236afe4e340c3ffcc934dafeedd5a90..efae67e3bf13f533c33a6a8545ffed378b6beb2b 100644
--- a/src/server/DrawingController.java
+++ b/src/server/DrawingController.java
@@ -34,7 +34,7 @@ public class DrawingController extends UnicastRemoteObject implements IDrawingCo
 
     @Override
     public boolean broadcastText(String fromClient, String text, Font font, Color color, Point startPoint) throws RemoteException {
-        System.out.print("Broadcasting drawing to everyone...");
+//        System.out.print("Broadcasting drawing to everyone...");
 
         g2 = (Graphics2D) bufferedImage.getGraphics();
         g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
@@ -55,7 +55,7 @@ public class DrawingController extends UnicastRemoteObject implements IDrawingCo
             }
         }
 
-        System.out.print("...DONE\n");
+//        System.out.print("...DONE\n");
 
         return true;
     }
@@ -63,7 +63,7 @@ public class DrawingController extends UnicastRemoteObject implements IDrawingCo
 
     @Override
     public boolean broadcastDrawing(String fromClient, Shape drawing, String mode, Color color, int strokeSize) throws RemoteException {
-        System.out.print("Broadcasting drawing to everyone...");
+//        System.out.print("Broadcasting drawing to everyone...");
 
         g2 = (Graphics2D) bufferedImage.getGraphics();
         g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
@@ -97,13 +97,13 @@ public class DrawingController extends UnicastRemoteObject implements IDrawingCo
             }
         }
 
-        System.out.print("...DONE\n");
+//        System.out.print("...DONE\n");
 
         return true;
     }
 
     public boolean broadcastDraggingDrawing(String fromClient, Shape drawing, String mode, Color color, int strokeSize) throws RemoteException {
-        System.out.print("Broadcasting dragging drawing to everyone...");
+//        System.out.print("Broadcasting dragging drawing to everyone...");
 
         g2 = (Graphics2D) bufferedImage.getGraphics();
         g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
@@ -137,13 +137,13 @@ public class DrawingController extends UnicastRemoteObject implements IDrawingCo
             }
         }
 
-        System.out.print("...DONE\n");
+//        System.out.print("...DONE\n");
 
         return true;
     }
 
     public boolean broadcastClearCanvas(String fromClient) throws RemoteException {
-        System.out.print("Broadcasting canvas clearance to everyone...");
+//        System.out.print("Broadcasting canvas clearance to everyone...");
 
         IDrawingUpdate client;
 
@@ -159,7 +159,7 @@ public class DrawingController extends UnicastRemoteObject implements IDrawingCo
             }
         }
 
-        System.out.print("...DONE\n");
+//        System.out.print("...DONE\n");
 
         return true;
     }
@@ -178,7 +178,7 @@ public class DrawingController extends UnicastRemoteObject implements IDrawingCo
 
 
     public boolean broadcastUpdateImage(String fromClient) throws RemoteException {
-        System.out.print("Broadcasting new image loading to everyone...");
+//        System.out.print("Broadcasting new image loading to everyone...");
 
         try {
 
@@ -206,7 +206,7 @@ public class DrawingController extends UnicastRemoteObject implements IDrawingCo
             err.printStackTrace();
         }
 
-        System.out.print("...DONE\n");
+//        System.out.print("...DONE\n");
 
         return true;
     }