Added StretchedGoalOverlapFinder + some refactoring