diff --git a/app/models/wrestler.rb b/app/models/wrestler.rb
index 818f4c9..328f2f8 100644
--- a/app/models/wrestler.rb
+++ b/app/models/wrestler.rb
@@ -126,7 +126,7 @@ class Wrestler < ActiveRecord::Base
 	end
 
 	def hasAPoolBye
-		if weight.poolRounds(allMatches) > poolMatches.size
+		if weight.poolRounds(matches) > poolMatches.size
 			return true
 		else
 			return false
diff --git a/app/services/wrestler_services/calculate_wrestler_team_score.rb b/app/services/wrestler_services/calculate_wrestler_team_score.rb
index d63d23f..c01db4d 100644
--- a/app/services/wrestler_services/calculate_wrestler_team_score.rb
+++ b/app/services/wrestler_services/calculate_wrestler_team_score.rb
@@ -5,9 +5,9 @@ class CalculateWrestlerTeamScore
     end
     
     def totalScore
-        if @wrestler.extra
-			return 0
-		else
+        if @wrestler.extra or @wrestler.matches.count == 0
+			return 0            
+        else
             earnedPoints - deductedPoints
         end
     end
diff --git a/app/services/wrestler_services/pool_bracket_placement_points.rb b/app/services/wrestler_services/pool_bracket_placement_points.rb
index 4cf5713..c8d689c 100644
--- a/app/services/wrestler_services/pool_bracket_placement_points.rb
+++ b/app/services/wrestler_services/pool_bracket_placement_points.rb
@@ -67,17 +67,17 @@ class PoolBracketPlacementPoints
     end
     
     def onePool
-       poolOrder = @wrestler.weight.poolOrder(1)
-       if @wrestler == poolOrder.first
-           return firstPlace
-       elsif @wrestler == poolOrder.second 
-            return secondPlace
-       elsif @wrestler == poolOrder.third 
-            return thirdPlace
-       elsif @wrestler == poolOrder.fourth 
-            return fourthPlace
-       end
-       return 0
+           poolOrder = @wrestler.weight.poolOrder(1)
+           if @wrestler == poolOrder.first
+               return firstPlace
+           elsif @wrestler == poolOrder.second 
+                return secondPlace
+           elsif @wrestler == poolOrder.third 
+                return thirdPlace
+           elsif @wrestler == poolOrder.fourth 
+                return fourthPlace
+           end
+            return 0
     end
     
     def finalMatchPoints
diff --git a/test/integration/pool_advancement_test.rb b/test/integration/pool_advancement_test.rb
index 613193a..eb2bb87 100644
--- a/test/integration/pool_advancement_test.rb
+++ b/test/integration/pool_advancement_test.rb
@@ -404,7 +404,7 @@ class PoolAdvancementTest < ActionDispatch::IntegrationTest
     #Won four in pool
     assert_equal 22, wrestler1.totalTeamPoints
     #Won two in pool
-    assert_equal 16, wrestler2.totalTeamPoints
+    assert_equal 18, wrestler2.totalTeamPoints
   end
   
   test "advancement points 1/2" do
@@ -547,13 +547,13 @@ class PoolAdvancementTest < ActionDispatch::IntegrationTest
   
   test "Championship bracket wins are 2pts" do
     elevenManBracketToQuarter
-    assert_equal 7, Wrestler.where("name = ?", "Guy11").first.teamPointsEarned
+    assert_equal 9, Wrestler.where("name = ?", "Guy11").first.teamPointsEarned
     
     endMatch(4006,"Guy11")
-    assert_equal 15, Wrestler.where("name = ?", "Guy11").first.teamPointsEarned
+    assert_equal 17, Wrestler.where("name = ?", "Guy11").first.teamPointsEarned
     endMatch(4007,"Guy14")
     endMatch(5004,"Guy11")
-    assert_equal 20, Wrestler.where("name = ?", "Guy11").first.teamPointsEarned
+    assert_equal 22, Wrestler.where("name = ?", "Guy11").first.teamPointsEarned
   end
   
   test "Conso bracket wins are 1pt" do