diff --git a/manual_testing.docx b/manual_testing.docx
index 0a8934b..91d43e6 100644
Binary files a/manual_testing.docx and b/manual_testing.docx differ
diff --git a/src/main/java/program/main/Controller.java b/src/main/java/program/main/Controller.java
index 8a3d84f..239bddd 100644
--- a/src/main/java/program/main/Controller.java
+++ b/src/main/java/program/main/Controller.java
@@ -1,6 +1,5 @@
 package program.main;
 
-
 import java.util.Random;
 import static program.main.Main.game;
 import static program.main.State.Working;
@@ -11,7 +10,7 @@ public class Controller {
      * attributumok
      */
 
-    private static int CoolDown;
+    private static int coolDown;
 
     private static int roundsLeft = 10;
     private static int plumberCoolDown;
@@ -22,12 +21,12 @@ public class Controller {
 
     private static Random rand;
     private static int index;
-    static Nomad CurrentNomad;
-    static Plumber CurrentPlumber;
+    static Nomad currentNomad;
+    static Plumber currentPlumber;
 
-    static boolean CurrentTurnIsNomad = false;
+    static boolean  currentTurnIsNomad = false;
 
-    static boolean GameOver = false;
+    static boolean gameOver = false;
 
 
     /**functions
@@ -37,7 +36,7 @@ public class Controller {
      * setRounds
      * Változtatja a roundLeft adattag értékét -1 el
      */
-    public static void setRounds_min1() {
+    public static void decrementRounds() {
         roundsLeft--;
     }
 
@@ -46,7 +45,12 @@ public static void setRounds_min1() {
      *
      * @param i Az új hátralévő körök száma.
      */
-    public static void setRounds(int i){roundsLeft=i;}
+    public static void setRounds(int i){
+        if (i < 0){
+            throw new IllegalArgumentException("Round count cannot be negative");
+        }
+        roundsLeft = i;
+    }
 
     /**
      * Visszaadja a jelenlegi vízszerelő játékost.
@@ -54,7 +58,7 @@ public static void setRounds_min1() {
      * @return A jelenlegi vízszerelő játékos.
      */
     public static Plumber getCurrentPlumber() {
-        return CurrentPlumber;
+        return currentPlumber;
     }
 
     /**
@@ -63,7 +67,7 @@ public static Plumber getCurrentPlumber() {
      * @return A jelenlegi nomád játékos.
      */
     public static Nomad getCurrentNomad() {
-        return CurrentNomad;
+        return currentNomad;
     }
 
     /**
@@ -86,7 +90,7 @@ public static int getRounds() {
      */
     public static int getCoolDown() {
         // System.out.println("SUCCESS - Controller.getPlumberCoolDown()");
-        return CoolDown;
+        return coolDown;
     }
 
     /**
@@ -97,7 +101,7 @@ public static int getCoolDown() {
      */
     public static void setCoolDown(int value) {
         //System.out.println("SUCCESS - Controller.setNomadCoolDown()");
-        CoolDown = value;
+        coolDown = value;
     }
 
     /**
@@ -108,7 +112,7 @@ public static void setCoolDown(int value) {
      */
     public static int getNomadCoolDown() {
         // System.out.println("SUCCESS - Controller.getNomadCoolDown()");
-        return CoolDown;
+        return coolDown;
     }
 
     /**
@@ -116,8 +120,8 @@ public static int getNomadCoolDown() {
      *
      * @return A jelenlegi nomád játékos.
      */
-    public Nomad CurrentNomadTurn() {
-        return CurrentNomad;
+    public Nomad currentNomadTurn() {
+        return currentNomad;
     }
 
     /**
@@ -125,8 +129,8 @@ public Nomad CurrentNomadTurn() {
      *
      * @return A jelenlegi vízszerelő játékos.
      */
-    public Plumber CurrentPlumberTurn() {
-        return CurrentPlumber;
+    public Plumber currentPlumberTurn() {
+        return currentPlumber;
     }
 
     /**
@@ -135,82 +139,59 @@ public Plumber CurrentPlumberTurn() {
      */
     public void turn() {
         if (getRounds() == 0){
-            GameOver = true;
+            gameOver = true;
             return;
         }
-        //System.out.println("lefut a turn");
-        //System.out.println(game.plumberButtonPanel.getendturn());
         Main.game.getGameWindow().getPlumberButtonPanel().setVisible(true);
         for (int i = 0; i < game.Plumbers().size(); i++) {
-            //System.out.println("plumber size: " + game.Plumbers().size());
             game.Nomads().get(i).setMoved(false);
-            //System.out.println("plumber");
-            CurrentPlumber = game.Plumbers().get(i);
+            currentPlumber = game.Plumbers().get(i);
             while (!game.plumberButtonPanel.getendturn()) {
-                CurrentPlumber = game.Plumbers().get(i);
-                CurrentPlumber.turn();
+                currentPlumber = game.Plumbers().get(i);
+                currentPlumber.turn();
             }
             Main.game.gamePanel.repaint();
             game.Plumbers().get(i).setMoved(false);
 
-            //System.out.println("plumber ended");
             Main.game.gamePanel.repaint();
             for (int j = 0; j < game.Pipes().size(); j++) {
                 game.Pipes().get(j).turn();
             }
-            //System.out.println("minden pipe turn");
             for (int k = 0; k < game.Fields().size(); k++) {
                 game.Fields().get(k).turn();
             }
-            //System.out.println("minden fiels turn");
 
             game.plumberButtonPanel.resetTurn(false);
-            //System.out.println("plumber turn reset");
-            //System.out.println(game.plumberButtonPanel.getendturn());
-            //System.out.println("szerelo : " + plumberPoints);
-            //System.out.println("nomad : " + nomadPoints);
 
         }
-        CurrentTurnIsNomad = true;
+         currentTurnIsNomad = true;
         Main.game.getGameWindow().getPlumberButtonPanel().setVisible(false);
         Main.game.getGameWindow().getNomadButtonPanel().setVisible(true);
 
 
         for (int i = 0; i < game.Nomads().size(); i++) {
             game.Nomads().get(i).setMoved(false);
-            CurrentNomad = game.Nomads().get(i);
+            currentNomad = game.Nomads().get(i);
             while (!game.nomadButtonPanel.getendturn()) {
-                CurrentNomad = game.Nomads().get(i);
-                CurrentPlumber.turn();
+                currentNomad = game.Nomads().get(i);
+                currentPlumber.turn();
             }
             Main.game.gamePanel.repaint();
             game.Nomads().get(i).setMoved(false);
 
-            //System.out.println("plumber ended");
             Main.game.gamePanel.repaint();
             for (int k = 0; k < game.Pipes().size(); k++) {
                 game.Pipes().get(k).turn();
             }
-            //System.out.println("minden pipe turn");
             for (int j = 0; j < game.Fields().size(); j++) {
                 game.Fields().get(j).turn();
             }
-            //System.out.println("minden fiels turn");
-
             game.nomadButtonPanel.resetTurn(false);
-            //System.out.println("nomad turn reset");
-            //System.out.println(game.nomadButtonPanel.getendturn());
-            //.out.println("szerelo : " + plumberPoints);
-            //System.out.println("nomad : " + nomadPoints);
         }
-        CurrentTurnIsNomad = false;
+         currentTurnIsNomad = false;
         Main.game.getGameWindow().getNomadButtonPanel().setVisible(false);
         Main.game.getGameWindow().getPlumberButtonPanel().setVisible(true);
-        setRounds_min1();
-
-
-
-
+        decrementRounds();
     }
 
     /**
@@ -276,7 +257,7 @@ public static void destroyPump() {
     }
 
     public static boolean getCurrentTurnIsNomad() {
-        return CurrentTurnIsNomad;
+        return  currentTurnIsNomad;
     }
 
     public static void setPlumberPoints(int plumberPoints) {
diff --git a/src/main/java/program/main/Field.java b/src/main/java/program/main/Field.java
index af9cc1c..2f56874 100644
--- a/src/main/java/program/main/Field.java
+++ b/src/main/java/program/main/Field.java
@@ -1,12 +1,8 @@
 package program.main;
 
-
-import java.awt.image.BufferedImage;
 import java.io.Serializable;
 import java.util.ArrayList;
 
-
-
 /**
  * A pálya ezekből az elemekből áll. Ez egy absztrakt osztály.
  */
@@ -21,17 +17,14 @@ public abstract class Field implements Round, Serializable {
 
     public void SetName(String s) {
         ID = s;
-        //System.out.println("SUCCESS - Field.SetName()");
     }
 
     public String GetName() {
-        //System.out.println("SUCCESS - Field.GetName()");
         return ID;
     }
 
     @Override
     public String toString() {
-        //System.out.println("SUCCESS - Field.toString()");
         return (ID + " Field");
     }
 
@@ -127,9 +120,7 @@ public String toString() {
     /**
      * A víz áramlását valósítja meg.
      */
-    public void waterFlowing() {
-        //System.out.println("SUCCESS - Field.waterFlowing");
-    }
+    public abstract void waterFlowing();
 
     /**
      * Beállítja, hogy a ciszternában van-e pumpa a newPump adattag értékének változtatásával.
@@ -145,9 +136,9 @@ public void waterFlowing() {
      */
     public abstract boolean getNewPump();
 
-    public abstract ArrayList getConnectedPipes();
+    public abstract ArrayList<Pipe> getConnectedPipes();
 
-    public abstract ArrayList getConnectedPumps();
+    public abstract ArrayList<Pump> getConnectedPumps();
 
     /**
      * A field állapotának lekérésére szolgál
@@ -155,7 +146,6 @@ public void waterFlowing() {
      * @param state
      */
     public void setState(State state) {
-        //System.out.println("SUCCESS - Field.setState()");
         this.state = state;
     }
 
@@ -165,7 +155,6 @@ public void setState(State state) {
      * @return
      */
     public State getState() {
-        //System.out.println("SUCCESS - Field.getState()");
         return state;
     }
 
diff --git a/src/main/java/program/main/Plumber.java b/src/main/java/program/main/Plumber.java
index c320615..da84316 100644
--- a/src/main/java/program/main/Plumber.java
+++ b/src/main/java/program/main/Plumber.java
@@ -1,6 +1,4 @@
 package program.main;
-
-import java.awt.*;
 import java.io.Serializable;
 
 public class Plumber extends Player implements Serializable {
@@ -37,8 +35,6 @@ public void repair(Field f) {
         if (this.getCooldown() <= 0) {
             if (this.getPosition().getConnectedPipes().contains(f) || this.getPosition().equals(f)) {
                 f.repair();
-                //System.out.println("SUCCESS - Plumber.repair()");
-                // this.done = true;
                 this.cooldown = Controller.getNomadCoolDown();
             }
         }
@@ -62,14 +58,12 @@ public void pickUpPump() {
                     if (!egyezik) {
                         Pump p = new Pump("pump" + counter, LoadSave.PUMP_WORKING_EMPTY);
                         this.setPumpInPocket(p);
-                        //this.done = true;
-                        //System.out.println("SUCCESS - Plumber.pickUpPump()");
                         break;
                     }
                 }
             }
         } catch (Exception e) {
-            //System.out.println();
+        
         }
     }
 
@@ -83,11 +77,7 @@ public void pickUpPipe(Pipe p) {
             this.setPipeInPocket(p);
             this.getPosition().removePipe(p);
             p.pickedUp(this);
-            //this.done = true;
-            //System.out.println("SUCCESS - Plumber.pickUpPipe()");
-        } else {
-            //System.out.println("FAILED - The pipe is not connected to the pump!");
-        }
+        } 
     }
 
     /**
@@ -106,8 +96,6 @@ public void pickUpNewPipe() {
                     Pipe pipe = new Pipe(this.getPosition(), this, "pipe" + counter);
                     game.Pipes().add(pipe);
                     this.setPipeInPocket(pipe);
-                    //this.done = true;
-                    //System.out.println("SUCCESS - Plumber.pickUpNewPump()");
                     break;
                 }
             }
@@ -127,14 +115,8 @@ public void placePump(Pipe p) {
             if (this.getPosition().getConnectedPipes().contains(p)) {
                 p.placePump(this.getPumpInPocket());
                 this.setPumpInPocket(null);
-                //this.done = true;
-                //System.out.println("SUCCESS - Plumber.placePump()");
-            } else {
-                //System.out.println("FAILED - The pipe is not connected to the pump!");
-            }
-        } else {
-            //System.out.println("FAILED - There is no pump in the pocket!");
-        }
+            }; 
+        }; 
     }
 
     /**
@@ -145,8 +127,6 @@ public void placePipe() {
             this.getPosition().connectPipe(this.getPipeInPocket());
             this.getPipeInPocket().placedDown();
             this.setPipeInPocket(null);
-            //this.done = true;
-            //System.out.println("SUCCESS - Plumber.placePipe()");
         }
     }
 
@@ -157,7 +137,6 @@ public void placePipe() {
      */
     public void setPipeInPocket(Pipe p) {
         pipeInPocket = p;
-        //System.out.println("SUCCESS - Plumber.setPipeInPocket()");
     }
 
     /**
@@ -167,7 +146,6 @@ public void setPipeInPocket(Pipe p) {
      */
     public void setPumpInPocket(Pump pump) {
         pumpInPocket = pump;
-        //System.out.println("SUCCESS - Plumber.setPumpInPocket()");
     }
 
     /**
@@ -177,9 +155,6 @@ public void turn() {
 
         this.decreaseCooldown();
         this.decreaseStuckTimeLeft();
-        //System.out.println("SUCCESS - Plumber.turn()");
-
-
     }
 
     /**
@@ -188,7 +163,6 @@ public void turn() {
      * @return
      */
     public Pump getPumpInPocket() {
-        //System.out.println("SUCCESS - Plumber.getPumpInPocket()");
         return pumpInPocket;
     }
 
@@ -198,7 +172,6 @@ public Pump getPumpInPocket() {
      * @return
      */
     public Pipe getPipeInPocket() {
-        //System.out.println("SUCCESS - Plumber.getPipeInPocket()");
         return pipeInPocket;
     }
 
diff --git a/target/classes/program/main/Cistern.class b/target/classes/program/main/Cistern.class
index 963210b..48ffe76 100644
Binary files a/target/classes/program/main/Cistern.class and b/target/classes/program/main/Cistern.class differ
diff --git a/target/classes/program/main/Controller.class b/target/classes/program/main/Controller.class
index da35cc3..b8e9c7a 100644
Binary files a/target/classes/program/main/Controller.class and b/target/classes/program/main/Controller.class differ
diff --git a/target/classes/program/main/Field.class b/target/classes/program/main/Field.class
index 4a4b3d7..b061695 100644
Binary files a/target/classes/program/main/Field.class and b/target/classes/program/main/Field.class differ
diff --git a/target/classes/program/main/Game.class b/target/classes/program/main/Game.class
index ee141ac..5ba2a0b 100644
Binary files a/target/classes/program/main/Game.class and b/target/classes/program/main/Game.class differ
diff --git a/target/classes/program/main/GamePanel.class b/target/classes/program/main/GamePanel.class
index 8e4d1e0..accc704 100644
Binary files a/target/classes/program/main/GamePanel.class and b/target/classes/program/main/GamePanel.class differ
diff --git a/target/classes/program/main/Nomad.class b/target/classes/program/main/Nomad.class
index 5123ee2..c4193d8 100644
Binary files a/target/classes/program/main/Nomad.class and b/target/classes/program/main/Nomad.class differ
diff --git a/target/classes/program/main/NomadButtonPanel.class b/target/classes/program/main/NomadButtonPanel.class
index 00b2228..4cf7246 100644
Binary files a/target/classes/program/main/NomadButtonPanel.class and b/target/classes/program/main/NomadButtonPanel.class differ
diff --git a/target/classes/program/main/NomadMoveWindow.class b/target/classes/program/main/NomadMoveWindow.class
index 6a5243f..18afc74 100644
Binary files a/target/classes/program/main/NomadMoveWindow.class and b/target/classes/program/main/NomadMoveWindow.class differ
diff --git a/target/classes/program/main/NomadPipeInWindow.class b/target/classes/program/main/NomadPipeInWindow.class
index 604b912..e3d9373 100644
Binary files a/target/classes/program/main/NomadPipeInWindow.class and b/target/classes/program/main/NomadPipeInWindow.class differ
diff --git a/target/classes/program/main/NomadPipeInteraction.class b/target/classes/program/main/NomadPipeInteraction.class
index 79de03c..0cdaad9 100644
Binary files a/target/classes/program/main/NomadPipeInteraction.class and b/target/classes/program/main/NomadPipeInteraction.class differ
diff --git a/target/classes/program/main/NomadPipeOutWindow.class b/target/classes/program/main/NomadPipeOutWindow.class
index e9b2a87..5bd7fdf 100644
Binary files a/target/classes/program/main/NomadPipeOutWindow.class and b/target/classes/program/main/NomadPipeOutWindow.class differ
diff --git a/target/classes/program/main/Pipe.class b/target/classes/program/main/Pipe.class
index a4473b8..cd56b80 100644
Binary files a/target/classes/program/main/Pipe.class and b/target/classes/program/main/Pipe.class differ
diff --git a/target/classes/program/main/Player.class b/target/classes/program/main/Player.class
index 49536c4..aa627d3 100644
Binary files a/target/classes/program/main/Player.class and b/target/classes/program/main/Player.class differ
diff --git a/target/classes/program/main/Plumber.class b/target/classes/program/main/Plumber.class
index 64e3e84..a89c89d 100644
Binary files a/target/classes/program/main/Plumber.class and b/target/classes/program/main/Plumber.class differ
diff --git a/target/classes/program/main/PlumberButtonPanel.class b/target/classes/program/main/PlumberButtonPanel.class
index ac7ca00..4f34597 100644
Binary files a/target/classes/program/main/PlumberButtonPanel.class and b/target/classes/program/main/PlumberButtonPanel.class differ
diff --git a/target/classes/program/main/PlumberMoveWindow.class b/target/classes/program/main/PlumberMoveWindow.class
index 36a8dd7..2858bd4 100644
Binary files a/target/classes/program/main/PlumberMoveWindow.class and b/target/classes/program/main/PlumberMoveWindow.class differ
diff --git a/target/classes/program/main/PlumberPickUpWindow.class b/target/classes/program/main/PlumberPickUpWindow.class
index dcb4527..c28c0fa 100644
Binary files a/target/classes/program/main/PlumberPickUpWindow.class and b/target/classes/program/main/PlumberPickUpWindow.class differ
diff --git a/target/classes/program/main/PlumberPipeInWindow.class b/target/classes/program/main/PlumberPipeInWindow.class
index 5da85b0..f063cc8 100644
Binary files a/target/classes/program/main/PlumberPipeInWindow.class and b/target/classes/program/main/PlumberPipeInWindow.class differ
diff --git a/target/classes/program/main/PlumberPipeInteraction.class b/target/classes/program/main/PlumberPipeInteraction.class
index 14a185d..3c96be4 100644
Binary files a/target/classes/program/main/PlumberPipeInteraction.class and b/target/classes/program/main/PlumberPipeInteraction.class differ
diff --git a/target/classes/program/main/PlumberPipeOutWindow.class b/target/classes/program/main/PlumberPipeOutWindow.class
index 351cd83..869f037 100644
Binary files a/target/classes/program/main/PlumberPipeOutWindow.class and b/target/classes/program/main/PlumberPipeOutWindow.class differ
diff --git a/target/classes/program/main/Pump.class b/target/classes/program/main/Pump.class
index d82fa7a..bc52326 100644
Binary files a/target/classes/program/main/Pump.class and b/target/classes/program/main/Pump.class differ
diff --git a/target/classes/program/main/Spring.class b/target/classes/program/main/Spring.class
index efacf8d..cc564d1 100644
Binary files a/target/classes/program/main/Spring.class and b/target/classes/program/main/Spring.class differ
diff --git a/target/classes/program/main/restart_menu$1.class b/target/classes/program/main/restart_menu$1.class
index 7bdf471..f6f79be 100644
Binary files a/target/classes/program/main/restart_menu$1.class and b/target/classes/program/main/restart_menu$1.class differ
diff --git a/target/classes/program/main/restart_menu$2.class b/target/classes/program/main/restart_menu$2.class
index d1b3a64..2b60a21 100644
Binary files a/target/classes/program/main/restart_menu$2.class and b/target/classes/program/main/restart_menu$2.class differ
diff --git a/target/classes/program/main/restart_menu.class b/target/classes/program/main/restart_menu.class
index 896aac6..62ce77f 100644
Binary files a/target/classes/program/main/restart_menu.class and b/target/classes/program/main/restart_menu.class differ
diff --git a/target/classes/program/main/settings$1.class b/target/classes/program/main/settings$1.class
index 3d50c26..337fee8 100644
Binary files a/target/classes/program/main/settings$1.class and b/target/classes/program/main/settings$1.class differ
diff --git a/target/classes/program/main/settings$2.class b/target/classes/program/main/settings$2.class
index 7e66f2e..a3b6e21 100644
Binary files a/target/classes/program/main/settings$2.class and b/target/classes/program/main/settings$2.class differ
diff --git a/target/classes/program/main/settings.class b/target/classes/program/main/settings.class
index d99348b..497e477 100644
Binary files a/target/classes/program/main/settings.class and b/target/classes/program/main/settings.class differ
diff --git a/target/classes/program/main/startMenu$1.class b/target/classes/program/main/startMenu$1.class
index 903ab2f..aa95048 100644
Binary files a/target/classes/program/main/startMenu$1.class and b/target/classes/program/main/startMenu$1.class differ
diff --git a/target/classes/program/main/startMenu$2.class b/target/classes/program/main/startMenu$2.class
index d2f6734..b779dfe 100644
Binary files a/target/classes/program/main/startMenu$2.class and b/target/classes/program/main/startMenu$2.class differ
diff --git a/target/classes/program/main/startMenu$3.class b/target/classes/program/main/startMenu$3.class
index cf41d7f..1757847 100644
Binary files a/target/classes/program/main/startMenu$3.class and b/target/classes/program/main/startMenu$3.class differ
diff --git a/target/classes/program/main/startMenu.class b/target/classes/program/main/startMenu.class
index 766fca7..b6fb5be 100644
Binary files a/target/classes/program/main/startMenu.class and b/target/classes/program/main/startMenu.class differ
diff --git a/~$nual_testing.docx b/~$nual_testing.docx
new file mode 100644
index 0000000..0974788
Binary files /dev/null and b/~$nual_testing.docx differ