diff --git a/PHPSkills/FactorGraphs/Factor.php b/PHPSkills/FactorGraphs/Factor.php
index cf7e2d3..90e3b76 100644
--- a/PHPSkills/FactorGraphs/Factor.php
+++ b/PHPSkills/FactorGraphs/Factor.php
@@ -1,12 +1,15 @@
 <?php
 namespace Moserware\Skills\FactorGraphs;
 
-require_once(dirname(__FILE__) . "./../Guard.php");
-require_once(dirname(__FILE__) . "./../HashMap.php");
+require_once(dirname(__FILE__) . "/../Guard.php");
+require_once(dirname(__FILE__) . "/../HashMap.php");
+require_once(dirname(__FILE__) . "/Message.php");
+require_once(dirname(__FILE__) . "/Variable.php");
 
 use Moserware\Skills\Guard;
 use Moserware\Skills\HashMap;
 
+
 abstract class Factor
 {
     private $_messages = array();
@@ -50,7 +53,7 @@ abstract class Factor
         return $this->updateMessageVariable($this->_messages[$messageIndex], $this->_messageToVariableBinding->getValue($messageIndex));
     }
 
-    protected function updateMessageVariable($message, $variable)
+    protected function updateMessageVariable(Message $message, Variable $variable)
     {
         throw new Exception();
     }
@@ -74,11 +77,11 @@ abstract class Factor
         return $this->sendMessageVariable($message, $variable);
     }
 
-    protected abstract function sendMessageVariable($message, $variable);
+    protected abstract function sendMessageVariable(Message $message, Variable $variable);
 
-    public abstract function createVariableToMessageBinding($variable);
+    public abstract function createVariableToMessageBinding(Variable $variable);
 
-    protected function createVariableToMessageBindingWithMessage($variable, $message)
+    protected function createVariableToMessageBindingWithMessage(Variable $variable, Variable $message)
     {
         $index = count($this->_messages);
         $this->_messages[] = $message;
diff --git a/PHPSkills/FactorGraphs/FactorGraphLayer.php b/PHPSkills/FactorGraphs/FactorGraphLayer.php
index bee99d4..56e2260 100644
--- a/PHPSkills/FactorGraphs/FactorGraphLayer.php
+++ b/PHPSkills/FactorGraphs/FactorGraphLayer.php
@@ -1,7 +1,7 @@
 <?php
 namespace Moserware\Skills\FactorGraphs;
 
-require_once(dirname(__FILE__) . "Schedule.php");
+require_once(dirname(__FILE__) . "/Schedule.php");
 
 abstract class FactorGraphLayer
 {
diff --git a/PHPSkills/FactorGraphs/FactorList.php b/PHPSkills/FactorGraphs/FactorList.php
index bc6db9a..e998826 100644
--- a/PHPSkills/FactorGraphs/FactorList.php
+++ b/PHPSkills/FactorGraphs/FactorList.php
@@ -2,7 +2,7 @@
 
 namespace Moserware\Skills\FactorGraphs;
 
-require_once(dirname(__FILE__) . "./Factor.php");
+require_once(dirname(__FILE__) . "/Factor.php");
 
 /// <summary>
 /// Helper class for computing the factor graph's normalization constant.
diff --git a/PHPSkills/FactorGraphs/VariableFactory.php b/PHPSkills/FactorGraphs/VariableFactory.php
index 0f13683..37146d8 100644
--- a/PHPSkills/FactorGraphs/VariableFactory.php
+++ b/PHPSkills/FactorGraphs/VariableFactory.php
@@ -2,7 +2,7 @@
 
 namespace Moserware\Skills\FactorGraphs;
 
-require_once(dirname(__FILE__) . "Variable.php");
+require_once(dirname(__FILE__) . "/Variable.php");
 
 class VariableFactory
 {
diff --git a/PHPSkills/SkillCalculator.php b/PHPSkills/SkillCalculator.php
index 5f2d170..4d2fec3 100644
--- a/PHPSkills/SkillCalculator.php
+++ b/PHPSkills/SkillCalculator.php
@@ -1,6 +1,10 @@
 <?php
 namespace Moserware\Skills;
 
+require_once(dirname(__FILE__) . "/GameInfo.php");
+require_once(dirname(__FILE__) . "/PlayersRange.php");
+require_once(dirname(__FILE__) . "/TeamsRange.php");
+
 /** 
  * Base class for all skill calculator implementations.
  */
@@ -25,7 +29,7 @@ abstract class SkillCalculator
     /// <param name="teams">A mapping of team players and their ratings.</param>
     /// <param name="teamRanks">The ranks of the teams where 1 is first place. For a tie, repeat the number (e.g. 1, 2, 2)</param>
     /// <returns>All the players and their new ratings.</returns>
-    public abstract function calculateNewRatings($gameInfo,
+    public abstract function calculateNewRatings(GameInfo $gameInfo,
                                                  array $teamsOfPlayerToRatings,
                                                  array $teamRanks);
 
@@ -36,7 +40,7 @@ abstract class SkillCalculator
     /// <param name="gameInfo">Parameters for the game.</param>
     /// <param name="teams">A mapping of team players and their ratings.</param>
     /// <returns>The quality of the match between the teams as a percentage (0% = bad, 100% = well matched).</returns>
-    public abstract function calculateMatchQuality($gameInfo,
+    public abstract function calculateMatchQuality(GameInfo $gameInfo,
                                                    array $teamsOfPlayerToRatings);
 
     public function isSupported($option)
diff --git a/PHPSkills/TrueSkill/FactorGraphTrueSkillCalculator.php b/PHPSkills/TrueSkill/FactorGraphTrueSkillCalculator.php
index 695867e..2dc6a03 100644
--- a/PHPSkills/TrueSkill/FactorGraphTrueSkillCalculator.php
+++ b/PHPSkills/TrueSkill/FactorGraphTrueSkillCalculator.php
@@ -40,7 +40,7 @@ class FactorGraphTrueSkillCalculator extends SkillCalculator
         parent::__construct(SkillCalculatorSupportedOptions::PARTIAL_PLAY | SkillCalculatorSupportedOptions::PARTIAL_UPDATE, TeamsRange::atLeast(2), PlayersRange::atLeast(1));
     }
 
-    public function CalculateNewRatings(GameInfo $gameInfo,
+    public function calculateNewRatings(GameInfo $gameInfo,
                                         array $teams,
                                         array $teamRanks)
     {
diff --git a/PHPSkills/TrueSkill/Factors/GaussianFactor.php b/PHPSkills/TrueSkill/Factors/GaussianFactor.php
index e868f97..e7599cf 100644
--- a/PHPSkills/TrueSkill/Factors/GaussianFactor.php
+++ b/PHPSkills/TrueSkill/Factors/GaussianFactor.php
@@ -2,10 +2,10 @@
 
 namespace Moserware\Skills\TrueSkill\Factors;
 
-require_once(dirname(__FILE__) . "../../FactorGraphs/Factor.php");
-require_once(dirname(__FILE__) . "../../FactorGraphs/Message.php");
-require_once(dirname(__FILE__) . "../../FactorGraphs/Variable.php");
-require_once(dirname(__FILE__) . "../../Numerics/GaussianDistribution.php");
+require_once(dirname(__FILE__) . "/../../FactorGraphs/Factor.php");
+require_once(dirname(__FILE__) . "/../../FactorGraphs/Message.php");
+require_once(dirname(__FILE__) . "/../../FactorGraphs/Variable.php");
+require_once(dirname(__FILE__) . "/../../Numerics/GaussianDistribution.php");
 
 use Moserware\Numerics\GaussianDistribution;
 use Moserware\Skills\FactorGraphs\Factor;
diff --git a/PHPSkills/TrueSkill/Factors/GaussianGreaterThanFactor.php b/PHPSkills/TrueSkill/Factors/GaussianGreaterThanFactor.php
index b767451..130d0e5 100644
--- a/PHPSkills/TrueSkill/Factors/GaussianGreaterThanFactor.php
+++ b/PHPSkills/TrueSkill/Factors/GaussianGreaterThanFactor.php
@@ -1,11 +1,11 @@
 <?php
 namespace Moserware\Skills\TrueSkill\Factors;
 
-require_once(dirname(__FILE__) . "GaussianFactor.php");
-require_once(dirname(__FILE__) . "../TruncatedGaussianCorrectionFunctions.php");
-require_once(dirname(__FILE__) . "../../FactorGraphs/Message.php");
-require_once(dirname(__FILE__) . "../../FactorGraphs/Variable.php");
-require_once(dirname(__FILE__) . "../../Numerics/GaussianDistribution.php");
+require_once(dirname(__FILE__) . "/GaussianFactor.php");
+require_once(dirname(__FILE__) . "/../TruncatedGaussianCorrectionFunctions.php");
+require_once(dirname(__FILE__) . "/../../FactorGraphs/Message.php");
+require_once(dirname(__FILE__) . "/../../FactorGraphs/Variable.php");
+require_once(dirname(__FILE__) . "/../../Numerics/GaussianDistribution.php");
 
 use Moserware\Numerics\GaussianDistribution;
 use Moserware\Skills\TrueSkill\TruncatedGaussianCorrectionFunctions;
diff --git a/PHPSkills/TrueSkill/Factors/GaussianLikelihoodFactor.php b/PHPSkills/TrueSkill/Factors/GaussianLikelihoodFactor.php
index a71104f..4fac94d 100644
--- a/PHPSkills/TrueSkill/Factors/GaussianLikelihoodFactor.php
+++ b/PHPSkills/TrueSkill/Factors/GaussianLikelihoodFactor.php
@@ -1,10 +1,10 @@
 <?php
 namespace Moserware\Skills\TrueSkill\Factors;
 
-require_once(dirname(__FILE__) . "GaussianFactor.php");
-require_once(dirname(__FILE__) . "../../FactorGraphs/Message.php");
-require_once(dirname(__FILE__) . "../../FactorGraphs/Variable.php");
-require_once(dirname(__FILE__) . "../../Numerics/GaussianDistribution.php");
+require_once(dirname(__FILE__) . "/GaussianFactor.php");
+require_once(dirname(__FILE__) . "/../../FactorGraphs/Message.php");
+require_once(dirname(__FILE__) . "/../../FactorGraphs/Variable.php");
+require_once(dirname(__FILE__) . "/../../Numerics/GaussianDistribution.php");
 
 use Moserware\Numerics\GaussianDistribution;
 use Moserware\Skills\FactorGraphs\Message;
diff --git a/PHPSkills/TrueSkill/Factors/GaussianPriorFactor.php b/PHPSkills/TrueSkill/Factors/GaussianPriorFactor.php
index 0276af0..d22b734 100644
--- a/PHPSkills/TrueSkill/Factors/GaussianPriorFactor.php
+++ b/PHPSkills/TrueSkill/Factors/GaussianPriorFactor.php
@@ -1,10 +1,10 @@
 <?php
 namespace Moserware\Skills\TrueSkill\Factors;
 
-require_once(dirname(__FILE__) . "GaussianFactor.php");
-require_once(dirname(__FILE__) . "../../FactorGraphs/Message.php");
-require_once(dirname(__FILE__) . "../../FactorGraphs/Variable.php");
-require_once(dirname(__FILE__) . "../../Numerics/GaussianDistribution.php");
+require_once(dirname(__FILE__) . "/GaussianFactor.php");
+require_once(dirname(__FILE__) . "/../../FactorGraphs/Message.php");
+require_once(dirname(__FILE__) . "/../../FactorGraphs/Variable.php");
+require_once(dirname(__FILE__) . "/../../Numerics/GaussianDistribution.php");
 
 use Moserware\Numerics\GaussianDistribution;
 use Moserware\Skills\FactorGraphs\Message;
diff --git a/PHPSkills/TrueSkill/Factors/GaussianWeightedSumFactor.php b/PHPSkills/TrueSkill/Factors/GaussianWeightedSumFactor.php
index 08e365a..7c425ca 100644
--- a/PHPSkills/TrueSkill/Factors/GaussianWeightedSumFactor.php
+++ b/PHPSkills/TrueSkill/Factors/GaussianWeightedSumFactor.php
@@ -1,10 +1,10 @@
 <?php
 namespace Moserware\Skills\TrueSkill\Factors;
 
-require_once(dirname(__FILE__) . "GaussianFactor.php");
-require_once(dirname(__FILE__) . "../../FactorGraphs/Message.php");
-require_once(dirname(__FILE__) . "../../FactorGraphs/Variable.php");
-require_once(dirname(__FILE__) . "../../Numerics/GaussianDistribution.php");
+require_once(dirname(__FILE__) . "/GaussianFactor.php");
+require_once(dirname(__FILE__) . "/../../FactorGraphs/Message.php");
+require_once(dirname(__FILE__) . "/../../FactorGraphs/Variable.php");
+require_once(dirname(__FILE__) . "/../../Numerics/GaussianDistribution.php");
 
 use Moserware\Numerics\GaussianDistribution;
 use Moserware\Skills\FactorGraphs\Message;
diff --git a/PHPSkills/TrueSkill/Factors/GaussianWithinFactor.php b/PHPSkills/TrueSkill/Factors/GaussianWithinFactor.php
index 23d661e..76a09b1 100644
--- a/PHPSkills/TrueSkill/Factors/GaussianWithinFactor.php
+++ b/PHPSkills/TrueSkill/Factors/GaussianWithinFactor.php
@@ -1,11 +1,11 @@
 <?php
 namespace Moserware\Skills\TrueSkill\Factors;
 
-require_once(dirname(__FILE__) . "GaussianFactor.php");
-require_once(dirname(__FILE__) . "../TruncatedGaussianCorrectionFunctions.php");
-require_once(dirname(__FILE__) . "../../FactorGraphs/Message.php");
-require_once(dirname(__FILE__) . "../../FactorGraphs/Variable.php");
-require_once(dirname(__FILE__) . "../../Numerics/GaussianDistribution.php");
+require_once(dirname(__FILE__) . "/GaussianFactor.php");
+require_once(dirname(__FILE__) . "/../TruncatedGaussianCorrectionFunctions.php");
+require_once(dirname(__FILE__) . "/../../FactorGraphs/Message.php");
+require_once(dirname(__FILE__) . "/../../FactorGraphs/Variable.php");
+require_once(dirname(__FILE__) . "/../../Numerics/GaussianDistribution.php");
 
 use Moserware\Numerics\GaussianDistribution;
 use Moserware\Skills\TrueSkill\TruncatedGaussianCorrectionFunctions;
diff --git a/PHPSkills/TrueSkill/Layers/IteratedTeamDifferencesInnerLayer.php b/PHPSkills/TrueSkill/Layers/IteratedTeamDifferencesInnerLayer.php
index b830381..9c7aaff 100644
--- a/PHPSkills/TrueSkill/Layers/IteratedTeamDifferencesInnerLayer.php
+++ b/PHPSkills/TrueSkill/Layers/IteratedTeamDifferencesInnerLayer.php
@@ -1,11 +1,11 @@
 <?php
 namespace Moserware\Skills\TrueSkill\Layers;
 
-require_once(dirname(__FILE__) . "../../FactorGraphs/Schedule.php");
-require_once(dirname(__FILE__) . "../TrueSkillFactorGraph.php");
-require_once(dirname(__FILE__) . "TrueSkillFactorGraphLayer.php");
-require_once(dirname(__FILE__) . "TeamPerformancesToTeamPerformanceDifferencesLayer.php");
-require_once(dirname(__FILE__) . "TeamDifferencesComparisonLayer.php");
+require_once(dirname(__FILE__) . "/../../FactorGraphs/Schedule.php");
+require_once(dirname(__FILE__) . "/../TrueSkillFactorGraph.php");
+require_once(dirname(__FILE__) . "/TrueSkillFactorGraphLayer.php");
+require_once(dirname(__FILE__) . "/TeamPerformancesToTeamPerformanceDifferencesLayer.php");
+require_once(dirname(__FILE__) . "/TeamDifferencesComparisonLayer.php");
 
 use Moserware\Skills\FactorGraphs\ScheduleLoop;
 use Moserware\Skills\FactorGraphs\ScheduleSequence;
diff --git a/PHPSkills/TrueSkill/Layers/PlayerPerformancesToTeamPerformancesLayer.php b/PHPSkills/TrueSkill/Layers/PlayerPerformancesToTeamPerformancesLayer.php
index b65b60d..d131a08 100644
--- a/PHPSkills/TrueSkill/Layers/PlayerPerformancesToTeamPerformancesLayer.php
+++ b/PHPSkills/TrueSkill/Layers/PlayerPerformancesToTeamPerformancesLayer.php
@@ -1,11 +1,11 @@
 <?php
 namespace Moserware\Skills\TrueSkill\Layers;
 
-require_once(dirname(__FILE__) . "../../FactorGraphs/Schedule.php");
-require_once(dirname(__FILE__) . "../TrueSkillFactorGraph.php");
-require_once(dirname(__FILE__) . "TrueSkillFactorGraphLayer.php");
-require_once(dirname(__FILE__) . "TeamPerformancesToTeamPerformanceDifferencesLayer.php");
-require_once(dirname(__FILE__) . "TeamDifferencesComparisonLayer.php");
+require_once(dirname(__FILE__) . "/../../FactorGraphs/Schedule.php");
+require_once(dirname(__FILE__) . "/../TrueSkillFactorGraph.php");
+require_once(dirname(__FILE__) . "/TrueSkillFactorGraphLayer.php");
+require_once(dirname(__FILE__) . "/TeamPerformancesToTeamPerformanceDifferencesLayer.php");
+require_once(dirname(__FILE__) . "/TeamDifferencesComparisonLayer.php");
 
 use Moserware\Skills\FactorGraphs\ScheduleLoop;
 use Moserware\Skills\FactorGraphs\ScheduleSequence;
diff --git a/PHPSkills/TrueSkill/Layers/PlayerPriorValuesToSkillsLayer.php b/PHPSkills/TrueSkill/Layers/PlayerPriorValuesToSkillsLayer.php
index 1b5f340..7668fe5 100644
--- a/PHPSkills/TrueSkill/Layers/PlayerPriorValuesToSkillsLayer.php
+++ b/PHPSkills/TrueSkill/Layers/PlayerPriorValuesToSkillsLayer.php
@@ -1,11 +1,11 @@
 <?php
 namespace Moserware\Skills\TrueSkill\Layers;
 
-require_once(dirname(__FILE__) . "../../FactorGraphs/Schedule.php");
-require_once(dirname(__FILE__) . "../../Numerics/BasicMath.php");
-require_once(dirname(__FILE__) . "../TrueSkillFactorGraph.php");
-require_once(dirname(__FILE__) . "../Factors/GaussianPriorFactor.php");
-require_once(dirname(__FILE__) . "TrueSkillFactorGraphLayer.php");
+require_once(dirname(__FILE__) . "/../../FactorGraphs/Schedule.php");
+require_once(dirname(__FILE__) . "/../../Numerics/BasicMath.php");
+require_once(dirname(__FILE__) . "/../TrueSkillFactorGraph.php");
+require_once(dirname(__FILE__) . "/../Factors/GaussianPriorFactor.php");
+require_once(dirname(__FILE__) . "/TrueSkillFactorGraphLayer.php");
 
 use Moserware\Skills\FactorGraphs\ScheduleLoop;
 use Moserware\Skills\FactorGraphs\ScheduleSequence;
@@ -14,6 +14,7 @@ use Moserware\Skills\TrueSkill\TrueSkillFactorGraph;
 use Moserware\Skills\TrueSkill\Factors\GaussianPriorFactor;
 
 // We intentionally have no Posterior schedule since the only purpose here is to
+// start the process.
 class PlayerPriorValuesToSkillsLayer extends TrueSkillFactorGraphLayer
 {
     private $_teams;
diff --git a/PHPSkills/TrueSkill/Layers/PlayerSkillsToPerformancesLayer.php b/PHPSkills/TrueSkill/Layers/PlayerSkillsToPerformancesLayer.php
index 95e40b4..6c19244 100644
--- a/PHPSkills/TrueSkill/Layers/PlayerSkillsToPerformancesLayer.php
+++ b/PHPSkills/TrueSkill/Layers/PlayerSkillsToPerformancesLayer.php
@@ -1,11 +1,11 @@
 <?php
 namespace Moserware\Skills\TrueSkill\Layers;
 
-require_once(dirname(__FILE__) . "../../FactorGraphs/Schedule.php");
-require_once(dirname(__FILE__) . "../../Numerics/BasicMath.php");
-require_once(dirname(__FILE__) . "../TrueSkillFactorGraph.php");
-require_once(dirname(__FILE__) . "../Factors/GaussianLikelihoodFactor.php");
-require_once(dirname(__FILE__) . "TrueSkillFactorGraphLayer.php");
+require_once(dirname(__FILE__) . "/../../FactorGraphs/Schedule.php");
+require_once(dirname(__FILE__) . "/../../Numerics/BasicMath.php");
+require_once(dirname(__FILE__) . "/../TrueSkillFactorGraph.php");
+require_once(dirname(__FILE__) . "/../Factors/GaussianLikelihoodFactor.php");
+require_once(dirname(__FILE__) . "/TrueSkillFactorGraphLayer.php");
 
 use Moserware\Skills\FactorGraphs\ScheduleStep;
 use Moserware\Skills\TrueSkill\TrueSkillFactorGraph;
diff --git a/PHPSkills/TrueSkill/Layers/TeamDifferencesComparisonLayer.php b/PHPSkills/TrueSkill/Layers/TeamDifferencesComparisonLayer.php
index fbd6d72..11b3235 100644
--- a/PHPSkills/TrueSkill/Layers/TeamDifferencesComparisonLayer.php
+++ b/PHPSkills/TrueSkill/Layers/TeamDifferencesComparisonLayer.php
@@ -1,11 +1,11 @@
 <?php
 namespace Moserware\Skills\TrueSkill\Layers;
 
-require_once(dirname(__FILE__) . "../DrawMargin.php");
-require_once(dirname(__FILE__) . "../TrueSkillFactorGraph.php");
-require_once(dirname(__FILE__) . "../Factors/GaussianGreaterThanFactor.php");
-require_once(dirname(__FILE__) . "../Factors/GaussianWithinFactor.php");
-require_once(dirname(__FILE__) . "TrueSkillFactorGraphLayer.php");
+require_once(dirname(__FILE__) . "/../DrawMargin.php");
+require_once(dirname(__FILE__) . "/../TrueSkillFactorGraph.php");
+require_once(dirname(__FILE__) . "/../Factors/GaussianGreaterThanFactor.php");
+require_once(dirname(__FILE__) . "/../Factors/GaussianWithinFactor.php");
+require_once(dirname(__FILE__) . "/TrueSkillFactorGraphLayer.php");
 
 use Moserware\Skills\TrueSkill\DrawMargin;
 use Moserware\Skills\TrueSkill\TrueSkillFactorGraph;
diff --git a/PHPSkills/TrueSkill/Layers/TeamPerformancesToTeamPerformanceDifferencesLayer.php b/PHPSkills/TrueSkill/Layers/TeamPerformancesToTeamPerformanceDifferencesLayer.php
index 6a647d9..4237411 100644
--- a/PHPSkills/TrueSkill/Layers/TeamPerformancesToTeamPerformanceDifferencesLayer.php
+++ b/PHPSkills/TrueSkill/Layers/TeamPerformancesToTeamPerformanceDifferencesLayer.php
@@ -1,10 +1,10 @@
 <?php
 namespace Moserware\Skills\TrueSkill\Layers;
 
-require_once(dirname(__FILE__) . "../../FactorGraphs/Variable.php");
-require_once(dirname(__FILE__) . "../TrueSkillFactorGraph.php");
-require_once(dirname(__FILE__) . "../Factors/GaussianWeightedSumFactor.php");
-require_once(dirname(__FILE__) . "TrueSkillFactorGraphLayer.php");
+require_once(dirname(__FILE__) . "/../../FactorGraphs/Variable.php");
+require_once(dirname(__FILE__) . "/../TrueSkillFactorGraph.php");
+require_once(dirname(__FILE__) . "/../Factors/GaussianWeightedSumFactor.php");
+require_once(dirname(__FILE__) . "/TrueSkillFactorGraphLayer.php");
 
 use Moserware\Skills\FactorGraphs\Variable;
 use Moserware\Skills\TrueSkill\DrawMargin;
diff --git a/PHPSkills/TrueSkill/Layers/TrueSkillFactorGraphLayer.php b/PHPSkills/TrueSkill/Layers/TrueSkillFactorGraphLayer.php
index c086aa3..10c7c25 100644
--- a/PHPSkills/TrueSkill/Layers/TrueSkillFactorGraphLayer.php
+++ b/PHPSkills/TrueSkill/Layers/TrueSkillFactorGraphLayer.php
@@ -1,7 +1,7 @@
 <?php
 namespace Moserware\Skills\TrueSkill\Layers;
 
-require_once(dirname(__FILE__) . "../../FactorGraphs/FactorGraphLayer.php");
+require_once(dirname(__FILE__) . "/../../FactorGraphs/FactorGraphLayer.php");
 
 use Moserware\Skills\FactorGraphs\FactorGraphLayer;
 
diff --git a/PHPSkills/TrueSkill/TrueSkillFactorGraph.php b/PHPSkills/TrueSkill/TrueSkillFactorGraph.php
index cbd294d..e34911b 100644
--- a/PHPSkills/TrueSkill/TrueSkillFactorGraph.php
+++ b/PHPSkills/TrueSkill/TrueSkillFactorGraph.php
@@ -1,11 +1,12 @@
 <?php
 namespace Moserware\Skills\TrueSkill;
 
-require_once(dirname(__FILE__) . './../Rating.php');
-require_once(dirname(__FILE__) . './../FactorGraphs/FactorList.php');
-require_once(dirname(__FILE__) . './../FactorGraphs/Schedule.php');
-require_once(dirname(__FILE__) . './../FactorGraphs/VariableFactory.php');
-require_once(dirname(__FILE__) . './../Numerics/GaussianDistribution.php');
+require_once(dirname(__FILE__) . '/../Rating.php');
+require_once(dirname(__FILE__) . '/../FactorGraphs/FactorGraph.php');
+require_once(dirname(__FILE__) . '/../FactorGraphs/FactorList.php');
+require_once(dirname(__FILE__) . '/../FactorGraphs/Schedule.php');
+require_once(dirname(__FILE__) . '/../FactorGraphs/VariableFactory.php');
+require_once(dirname(__FILE__) . '/../Numerics/GaussianDistribution.php');
 require_once(dirname(__FILE__) . '/Layers/PlayerPriorValuesToSkillsLayer.php');
 require_once(dirname(__FILE__) . '/Layers/PlayerSkillsToPerformancesLayer.php');
 require_once(dirname(__FILE__) . '/Layers/IteratedTeamDifferencesInnerLayer.php');
@@ -13,6 +14,7 @@ require_once(dirname(__FILE__) . '/Layers/TeamPerformancesToTeamPerformanceDiffe
 require_once(dirname(__FILE__) . '/Layers/TeamDifferencesComparisonLayer.php');
 
 use Moserware\Skills\Rating;
+use Moserware\Skills\FactorGraphs\FactorGraph;
 use Moserware\Skills\FactorGraphs\FactorList;
 use Moserware\Skills\FactorGraphs\ScheduleSequence;
 use Moserware\Skills\FactorGraphs\VariableFactory;
diff --git a/UnitTests/TrueSkill/FactorGraphTeamTrueSkillCalculatorTest.php b/UnitTests/TrueSkill/FactorGraphTeamTrueSkillCalculatorTest.php
index 708fb5f..df278ac 100644
--- a/UnitTests/TrueSkill/FactorGraphTeamTrueSkillCalculatorTest.php
+++ b/UnitTests/TrueSkill/FactorGraphTeamTrueSkillCalculatorTest.php
@@ -13,15 +13,14 @@ class FactorGraphTrueSkillCalculatorTest extends PHPUnit_Framework_TestCase
     public function testFactorGraphTrueSkillCalculator()
     {
         $calculator = new FactorGraphTrueSkillCalculator();
-
-        // We only support two players
+        
         TrueSkillCalculatorTests::testAllTwoPlayerScenarios($this, $calculator);
         TrueSkillCalculatorTests::testAllTwoTeamScenarios($this, $calculator);
     }
 }
 
 $testSuite = new \PHPUnit_Framework_TestSuite();
-$testSuite->addTest( new TwoTeamTrueSkillCalculatorTest("testFactorGraphTrueSkillCalculator"));
+$testSuite->addTest( new FactorGraphTrueSkillCalculatorTest("testFactorGraphTrueSkillCalculator"));
 
 \PHPUnit_TextUI_TestRunner::run($testSuite);
 ?>