diff --git a/OGP1718-Worms/src/worms/model/Projectile.java b/OGP1718-Worms/src/worms/model/Projectile.java
index 30b3233..c376960 100644
--- a/OGP1718-Worms/src/worms/model/Projectile.java
+++ b/OGP1718-Worms/src/worms/model/Projectile.java
@@ -154,7 +154,6 @@ public abstract class Projectile extends GameObject {
 
     public void hit(Worm... worm){
         for (Worm wormA : worm){
-            //TODO bazooka: hitpoints multiplied with force?
             wormA.decreaseHitPoints(getHitPoints());
         }
 		terminate();
diff --git a/OGP1718-Worms/src/worms/model/Team.java b/OGP1718-Worms/src/worms/model/Team.java
index 2447ce4..77eef48 100644
--- a/OGP1718-Worms/src/worms/model/Team.java
+++ b/OGP1718-Worms/src/worms/model/Team.java
@@ -83,8 +83,7 @@ public class Team {
         Collection<Worm> worms = getAllWormsOfTeam();
 
 	    for (Worm w : worm) {
-	        if (w == null || w.getTeam() != null) return false;
-	        if (!names.add(w.getName())) return false;
+	        if (w == null || w.getTeam() != null || !names.add(w.getName())) return false;
 	        if (worms.contains(w)) return false;
 	        if (worms.size() == 0 && !w.isTerminated()) continue;
             if (w.getMass() < getMinMassTeam() / 2 || w.getMass() > 2 * getMinMassTeam()