diff --git a/pitiupi.mpChat/Makefile b/pitiupi.mpChat/Makefile
index e2be90f..9c74139 100644
--- a/pitiupi.mpChat/Makefile
+++ b/pitiupi.mpChat/Makefile
@@ -1,15 +1,16 @@
 JAR = ../pitiupi/dist/pitiupi.jar
-OUT_DIR = /out
+OUT_DIR = out
 META-INF_DIR = src/META-INF
 DIST = dist/mpChat.jar
 
 SOURCES = $(shell find -name "*.java")
 
 all:
-	mkdir -p $(OUT_DIR)
+	mkdir -p "$(OUT_DIR)"
+	mkdir -p "$(dir $(DIST))"
 	javac -cp "$(JAR)" -d "$(OUT_DIR)" $(SOURCES)
 	cp -r "$(META-INF_DIR)" "$(OUT_DIR)"
 	jar cf "$(DIST)" -C "$(OUT_DIR)" .
 
 clean:
-	rm -rf "$(OUT_DIR)"/*
\ No newline at end of file
+	rm -rf "$(OUT_DIR)"/*
diff --git a/pitiupi.mpChat/out/GUI/ChatMenu.class b/pitiupi.mpChat/out/GUI/ChatMenu.class
index e8b9851..c0ab65b 100644
Binary files a/pitiupi.mpChat/out/GUI/ChatMenu.class and b/pitiupi.mpChat/out/GUI/ChatMenu.class differ
diff --git a/pitiupi.mpChat/out/GUI/ChatWindow.class b/pitiupi.mpChat/out/GUI/ChatWindow.class
index 97a91a4..0a97f82 100644
Binary files a/pitiupi.mpChat/out/GUI/ChatWindow.class and b/pitiupi.mpChat/out/GUI/ChatWindow.class differ
diff --git a/pitiupi.mpChat/out/GUI/PrivateChatWindow.class b/pitiupi.mpChat/out/GUI/PrivateChatWindow.class
index 147cc53..0d7a074 100644
Binary files a/pitiupi.mpChat/out/GUI/PrivateChatWindow.class and b/pitiupi.mpChat/out/GUI/PrivateChatWindow.class differ
diff --git a/pitiupi.mpChat/out/GUI/PublicChatWindow.class b/pitiupi.mpChat/out/GUI/PublicChatWindow.class
index 605cc2f..b8f8c03 100644
Binary files a/pitiupi.mpChat/out/GUI/PublicChatWindow.class and b/pitiupi.mpChat/out/GUI/PublicChatWindow.class differ
diff --git a/pitiupi.mpChat/out/control/ChatController.class b/pitiupi.mpChat/out/control/ChatController.class
index bbfa82b..864a1bb 100644
Binary files a/pitiupi.mpChat/out/control/ChatController.class and b/pitiupi.mpChat/out/control/ChatController.class differ
diff --git a/pitiupi.mpChat/out/net/MpChatMessage.class b/pitiupi.mpChat/out/net/MpChatMessage.class
index 2f15121..78047ae 100644
Binary files a/pitiupi.mpChat/out/net/MpChatMessage.class and b/pitiupi.mpChat/out/net/MpChatMessage.class differ
diff --git a/pitiupi.mpChat/out/plugin/MultiProtocolChat.class b/pitiupi.mpChat/out/plugin/MultiProtocolChat.class
index bbae454..7ecd755 100644
Binary files a/pitiupi.mpChat/out/plugin/MultiProtocolChat.class and b/pitiupi.mpChat/out/plugin/MultiProtocolChat.class differ
diff --git a/pitiupi.mpChat/src/GUI/ChatMenu.java b/pitiupi.mpChat/src/GUI/ChatMenu.java
index f336426..cf24b5b 100644
--- a/pitiupi.mpChat/src/GUI/ChatMenu.java
+++ b/pitiupi.mpChat/src/GUI/ChatMenu.java
@@ -13,12 +13,12 @@ public class ChatMenu extends JMenu {
         this.setText("MP-Chat");
 
         JMenuItem startPrivateChat = new JMenuItem("start Private Chat");
-        startPrivateChat.addActionListener(_ -> showPrivateChatDialog());
+        startPrivateChat.addActionListener(e -> showPrivateChatDialog());
         this.add(startPrivateChat);
     }
 
     public void newMenuItem(JMenuItem newMenuItem, ChatWindow chatWindow) {
-        newMenuItem.addActionListener(_ -> chatWindow.setVisible(true));
+        newMenuItem.addActionListener(e -> chatWindow.setVisible(true));
 
         this.add(newMenuItem);
     }
diff --git a/pitiupi.mpChat/src/GUI/PrivateChatWindow.java b/pitiupi.mpChat/src/GUI/PrivateChatWindow.java
index 56f111b..ad60dc4 100644
--- a/pitiupi.mpChat/src/GUI/PrivateChatWindow.java
+++ b/pitiupi.mpChat/src/GUI/PrivateChatWindow.java
@@ -14,9 +14,8 @@ public class PrivateChatWindow extends ChatWindow {
     private final TcpConnection connection;
 
     public PrivateChatWindow(ConnectionManager ConnectionManager, TcpConnection connection) {
-        this.connection = connection;
-
         super(ConnectionManager);
+	this.connection = connection;
     }
 
     @Override
@@ -41,4 +40,4 @@ public class PrivateChatWindow extends ChatWindow {
             Logger.getLogger(PrivateChatWindow.class.getName()).log(Level.SEVERE, null, ex);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/pitiupi.screenCast/dist/lib/pitiupi.jar b/pitiupi.screenCast/dist/lib/pitiupi.jar
deleted file mode 100644
index 85ec1b8..0000000
Binary files a/pitiupi.screenCast/dist/lib/pitiupi.jar and /dev/null differ
diff --git a/pitiupi.testSocket/pitiupi.testSocket.iml b/pitiupi.testSocket/pitiupi.testSocket.iml
new file mode 100644
index 0000000..c90834f
--- /dev/null
+++ b/pitiupi.testSocket/pitiupi.testSocket.iml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/pitiupi/nbproject/project.properties b/pitiupi/nbproject/project.properties
index 19c843c..dd76f4a 100644
--- a/pitiupi/nbproject/project.properties
+++ b/pitiupi/nbproject/project.properties
@@ -46,8 +46,8 @@ javac.modulepath=
 javac.processormodulepath=
 javac.processorpath=\
     ${javac.classpath}
-javac.source=25
-javac.target=25
+javac.source=17
+javac.target=17
 javac.test.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}
diff --git a/pitiupi/src/pitiupi/GUI/MainWindow.java b/pitiupi/src/pitiupi/GUI/MainWindow.java
index 139f697..1426c42 100644
--- a/pitiupi/src/pitiupi/GUI/MainWindow.java
+++ b/pitiupi/src/pitiupi/GUI/MainWindow.java
@@ -116,7 +116,7 @@ public class MainWindow extends javax.swing.JFrame {
     }
 
     private void updateStatus() {
-        this.status.setText("Connected on port " + connectionManager.getUserPort() + " name " + connectionManager.getUserName());
+        this.status.setText("Connected on port " + connectionManager.getPort() + " name " + connectionManager.getUserName());
     }
 
 }
diff --git a/pitiupi/src/pitiupi/control/ConnectionManager.java b/pitiupi/src/pitiupi/control/ConnectionManager.java
index 8fc360b..197b97d 100644
--- a/pitiupi/src/pitiupi/control/ConnectionManager.java
+++ b/pitiupi/src/pitiupi/control/ConnectionManager.java
@@ -56,7 +56,7 @@ public class ConnectionManager {
         try {
             socketUDP.sendMulticast(message);
             return true;
-        } catch (Exception _) {
+        } catch (Exception e) {
             System.err.println("Error sending UDP Multicast");
         }
         return false;
diff --git a/pitiupi/src/pitiupi/net/tcp/TcpConnectionManager.java b/pitiupi/src/pitiupi/net/tcp/TcpConnectionManager.java
index a8df7db..473283e 100644
--- a/pitiupi/src/pitiupi/net/tcp/TcpConnectionManager.java
+++ b/pitiupi/src/pitiupi/net/tcp/TcpConnectionManager.java
@@ -65,7 +65,7 @@ class TcpConnectionManager implements PeerListener {
      */
     public void addPrivateConnection(TcpConnection connection) {
         List<TcpConnection> connections =
-                privateConnections.computeIfAbsent(connection.getAddress(), _ -> new ArrayList<>());
+                privateConnections.computeIfAbsent(connection.getAddress(), e -> new ArrayList<>());
 
         synchronized (connections) {
             connections.add(connection);